From f3dc428ea08900f65fbd24586ae841e1bc687520 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 7 Nov 2019 11:21:32 +0000 Subject: rename datadir -> sharedir abuild uses datadir as local variable in various functions. Rename the global datadir to sharedir to avoid confusion. --- newapkbuild.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'newapkbuild.in') diff --git a/newapkbuild.in b/newapkbuild.in index 6130a4c..f50276b 100644 --- a/newapkbuild.in +++ b/newapkbuild.in @@ -7,13 +7,13 @@ # program_version=@VERSION@ -datadir=@datadir@ +sharedir=@sharedir@ -if ! [ -f "$datadir/functions.sh" ]; then - echo "$datadir/functions.sh: not found" >&2 +if ! [ -f "$sharedir/functions.sh" ]; then + echo "$sharedir/functions.sh: not found" >&2 exit 1 fi -. "$datadir/functions.sh" +. "$sharedir/functions.sh" is_url() { @@ -246,10 +246,10 @@ newaport() { # Copy init.d scripts if requested if [ -n "$cpinitd" ]; then - cp "$datadir"/sample.initd $pkgname.initd - cp "$datadir"/sample.confd $pkgname.confd - cp "$datadir"/sample.pre-install $pkgname.pre-install - cp "$datadir"/sample.post-install $pkgname.post-install + cp "$sharedir"/sample.initd $pkgname.initd + cp "$sharedir"/sample.confd $pkgname.confd + cp "$sharedir"/sample.pre-install $pkgname.pre-install + cp "$sharedir"/sample.post-install $pkgname.post-install install="\$pkgname.pre-install \$pkgname.post-install" source="$source $pkgname.initd -- cgit v1.2.3-70-g09d2