Use 'apk <cmd>' instead of apk_<cmd>

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

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

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

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}

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

setup-keymap.in

@@ -78,7 +78,7 @@ goodbye() {
 	exit $1
 }
 
-apk_info -eq bkeymaps
+apk info -eq bkeymaps
 was_installed=$?
 
 pkg_inst bkeymaps

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