summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--setup-acf.in4
-rw-r--r--setup-ads.in2
-rw-r--r--setup-alpine-web.in2
-rwxr-xr-xsetup-alpine.in2
-rwxr-xr-xsetup-cryptswap.in2
-rwxr-xr-xsetup-keymap.in2
-rwxr-xr-xsetup-mta.in2
7 files changed, 8 insertions, 8 deletions
diff --git a/setup-acf.in b/setup-acf.in
index c6f621e..487db00 100644
--- a/setup-acf.in
+++ b/setup-acf.in
@@ -15,7 +15,7 @@ pkgs="acf-core acf-alpine-baselayout acf-apk-tools openssl"
while getopts "ae:hl:n" opt ; do
case $opt in
- a) pkgs=`apk_fetch -l | grep ^acf-`;;
+ a) pkgs=`apk fetch -l | grep ^acf-`;;
e) EMAIL="$OPTARG";;
h) usage;;
l) address="$OPTARG";;
@@ -44,7 +44,7 @@ if [ "$create_passwd" != "no" ]; then
fi
# install packages
-apk_add mini_httpd $pkgs || exit 1
+apk add mini_httpd $pkgs || exit 1
# setup mini_httpd and start it
if [ -d /var/www/localhost/htdocs ]; then
diff --git a/setup-ads.in b/setup-ads.in
index ca959b6..d0dd29b 100644
--- a/setup-ads.in
+++ b/setup-ads.in
@@ -163,7 +163,7 @@ while getopts "D:fP:hvU:K:S:" opt ; do
done
shift `expr $OPTIND - 1`
-apk_add samba-ldap
+apk add samba-ldap
check_exist
ask_info
conf_krb
diff --git a/setup-alpine-web.in b/setup-alpine-web.in
index 3eaed7d..5da9d5b 100644
--- a/setup-alpine-web.in
+++ b/setup-alpine-web.in
@@ -45,7 +45,7 @@ do_setup() {
hostname $HNAME
# install needed packages
- apk_add dhcp iptables "$@"
+ apk add dhcp iptables "$@"
# config dhcp server
make_dhcp_global > /etc/dhcp/dhcpd.conf
diff --git a/setup-alpine.in b/setup-alpine.in
index 38113e3..ad84e23 100755
--- a/setup-alpine.in
+++ b/setup-alpine.in
@@ -100,7 +100,7 @@ if [ "$ARCHIVE" ] ; then
echo "Creating an Alpine overlay"
init_tmpdir ROOT
else
- PKGADD=apk_add
+ PKGADD="apk add"
fi
$PREFIX/sbin/setup-keymap ${KEYMAPOPTS}
diff --git a/setup-cryptswap.in b/setup-cryptswap.in
index 0ec11fc..7c9af32 100755
--- a/setup-cryptswap.in
+++ b/setup-cryptswap.in
@@ -31,7 +31,7 @@ else
fi
-apk_add cryptsetup-luks
+apk add cryptsetup-luks
# set the device in /etc/conf.f/cryptswap
if grep ^DEVICE= /etc/conf.d/cryptswap >/dev/null ; then
diff --git a/setup-keymap.in b/setup-keymap.in
index e3aefaa..022509a 100755
--- a/setup-keymap.in
+++ b/setup-keymap.in
@@ -78,7 +78,7 @@ goodbye() {
exit $1
}
-apk_info -eq bkeymaps
+apk info -eq bkeymaps
was_installed=$?
pkg_inst bkeymaps
diff --git a/setup-mta.in b/setup-mta.in
index 03af6bc..214387e 100755
--- a/setup-mta.in
+++ b/setup-mta.in
@@ -44,7 +44,7 @@ while [ "$res" != "221" ]; do
[ "x$res" = "x221" ] && echo "Connection to $mailhub is ok."
done
-apk_add ssmtp
+apk add ssmtp
setcfg mailhub $mailhub
setcfg FromLineOverride YES