From: Sergey Matveev Date: Fri, 14 Jun 2024 12:41:37 +0000 (+0300) Subject: Do not calculate BASS_ROOT everytime X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=57ccd1c453f793f1d0daacdd2b01db1b7cac5755a42e8d6f11738f62b9de2ede;p=bass.git Do not calculate BASS_ROOT everytime --- diff --git a/bin/notify b/bin/notify index 646a80d..f93a0ce 100755 --- a/bin/notify +++ b/bin/notify @@ -1,6 +1,6 @@ #!/bin/sh -e -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/.. . $BASS_ROOT/lib/rc subj="$@" diff --git a/build/bin/cksum b/build/bin/cksum index 271a842..18e2118 100755 --- a/build/bin/cksum +++ b/build/bin/cksum @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname="$0" . "$BASS_ROOT"/lib/rc tmp=$(mktemp) diff --git a/build/bin/mk-skelenv b/build/bin/mk-skelenv index 67ffaf9..92d1c99 100755 --- a/build/bin/mk-skelenv +++ b/build/bin/mk-skelenv @@ -2,7 +2,7 @@ # Usage: cd empty/dir ; mk-skelenv # Create local/ directory and install "rc-paths" and "stow" skelpkgs. -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname="$0" . "$BASS_ROOT"/lib/rc mkdir local diff --git a/build/bin/pkg-inst b/build/bin/pkg-inst index 8478b53..e7ad944 100755 --- a/build/bin/pkg-inst +++ b/build/bin/pkg-inst @@ -4,7 +4,7 @@ # considered. skelbin is always unpacked first, because it may contain # preinst hook. Lock is held during each skelpkg installation. -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname="$0" . "$BASS_ROOT"/lib/rc [ -d local ] || { diff --git a/build/bin/pkg-rm b/build/bin/pkg-rm index ef7de51..4b707c0 100755 --- a/build/bin/pkg-rm +++ b/build/bin/pkg-rm @@ -4,7 +4,7 @@ # un-stow-ing of its files. prerm and postrm hooks are considered. # Lock is held during each skelpkg removing. -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname="$0" . "$BASS_ROOT"/lib/rc [ -d local ] || { diff --git a/build/distfiles/age-v1.1.1-23-g29b68c2-modcache.do b/build/distfiles/age-v1.1.1-23-g29b68c2-modcache.do index 0267928..5bf7aff 100644 --- a/build/distfiles/age-v1.1.1-23-g29b68c2-modcache.do +++ b/build/distfiles/age-v1.1.1-23-g29b68c2-modcache.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname=$1.do . "$BASS_ROOT"/lib/rc redo-ifchange \ ${NAME%-modcache}.tar.zst \ diff --git a/build/distfiles/age-v1.1.1-23-g29b68c2.tar.zst.do b/build/distfiles/age-v1.1.1-23-g29b68c2.tar.zst.do index 478903c..d0bf8c8 100644 --- a/build/distfiles/age-v1.1.1-23-g29b68c2.tar.zst.do +++ b/build/distfiles/age-v1.1.1-23-g29b68c2.tar.zst.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname=$1.do . "$BASS_ROOT"/lib/rc [ -d age.git ] || git clone --depth 1 --bare https://github.com/FiloSottile/age.git >&2 cd age.git diff --git a/build/distfiles/cmake-3.28.3.tar.gz.do b/build/distfiles/cmake-3.28.3.tar.gz.do index 7f946cd..7aff8c8 100644 --- a/build/distfiles/cmake-3.28.3.tar.gz.do +++ b/build/distfiles/cmake-3.28.3.tar.gz.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname=$1.do . "$BASS_ROOT"/lib/rc redo-ifchange cmake-3.28.3-SHA-256.txt diff --git a/build/distfiles/dav1d-1.4.2-8-gda2cc78.tar.zst.do b/build/distfiles/dav1d-1.4.2-8-gda2cc78.tar.zst.do index 9b9bca3..eeddcc2 100644 --- a/build/distfiles/dav1d-1.4.2-8-gda2cc78.tar.zst.do +++ b/build/distfiles/dav1d-1.4.2-8-gda2cc78.tar.zst.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname=$1.do . "$BASS_ROOT"/lib/rc [ -d dav1d.git ] || git clone --depth 1 --bare https://code.videolan.org/videolan/dav1d.git >&2 cd dav1d.git diff --git a/build/distfiles/default.do b/build/distfiles/default.do index 01f562a..a5a6194 100644 --- a/build/distfiles/default.do +++ b/build/distfiles/default.do @@ -1,6 +1,6 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname=default.do . "$BASS_ROOT"/lib/rc # do not explicitly depend on that file, to omit redownloading # of everything in case it changes -. ./default.rc +. "$DISTFILES"/default.rc diff --git a/build/distfiles/dq-20240101.tar.zst.do b/build/distfiles/dq-20240101.tar.zst.do index 2beb3ab..ec2e0ad 100644 --- a/build/distfiles/dq-20240101.tar.zst.do +++ b/build/distfiles/dq-20240101.tar.zst.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname=$1.do . "$BASS_ROOT"/lib/rc [ -d dq.git ] || git clone --depth 1 --bare https://github.com/janmojzis/dq.git >&2 cd dq.git diff --git a/build/distfiles/gcc-4-compile-with-gcc-5.patch.do b/build/distfiles/gcc-4-compile-with-gcc-5.patch.do index 5402125..b67c195 100644 --- a/build/distfiles/gcc-4-compile-with-gcc-5.patch.do +++ b/build/distfiles/gcc-4-compile-with-gcc-5.patch.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname=$1.do . "$BASS_ROOT"/lib/rc [ -d guix.git ] || git clone --depth 1 --bare https://git.savannah.gnu.org/git/guix.git >&2 p=gnu/packages/patches/gcc-4-compile-with-gcc-5.patch diff --git a/build/distfiles/girara-0.4.3-7-gf6d0676.tar.zst.do b/build/distfiles/girara-0.4.3-7-gf6d0676.tar.zst.do index 84cc530..7d249e8 100644 --- a/build/distfiles/girara-0.4.3-7-gf6d0676.tar.zst.do +++ b/build/distfiles/girara-0.4.3-7-gf6d0676.tar.zst.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname=$1.do . "$BASS_ROOT"/lib/rc [ -d girara.git ] || git clone --depth 1 --bare https://git.pwmt.org/pwmt/girara.git >&2 cd girara.git diff --git a/build/distfiles/gogost-v5.14.0-modcache.do b/build/distfiles/gogost-v5.14.0-modcache.do index c23ca99..8fa9217 100644 --- a/build/distfiles/gogost-v5.14.0-modcache.do +++ b/build/distfiles/gogost-v5.14.0-modcache.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname=$1.do . "$BASS_ROOT"/lib/rc cd "$GOMODCACHE" mkdir -p cache/download/go.cypherpunks.ru/gogost/v5/@v diff --git a/build/distfiles/golang.org-x-tools-0.18.0-modcache.do b/build/distfiles/golang.org-x-tools-0.18.0-modcache.do index 8f5ac65..86624f4 100644 --- a/build/distfiles/golang.org-x-tools-0.18.0-modcache.do +++ b/build/distfiles/golang.org-x-tools-0.18.0-modcache.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname=$1.do . "$BASS_ROOT"/lib/rc abs3="$DISTFILES"/$3 redo-ifchange "$BASS_ROOT"/build/lib/zip-hash/zip-hash diff --git a/build/distfiles/gosha3-v1.0.0-modcache.do b/build/distfiles/gosha3-v1.0.0-modcache.do index 042ecf7..4005c03 100644 --- a/build/distfiles/gosha3-v1.0.0-modcache.do +++ b/build/distfiles/gosha3-v1.0.0-modcache.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname=$1.do . "$BASS_ROOT"/lib/rc redo-ifchange "$BASS_ROOT"/build/lib/zip-hash/zip-hash diff --git a/build/distfiles/gostls13-debash-1.22.4.tar.zst.do b/build/distfiles/gostls13-debash-1.22.4.tar.zst.do index 3de0702..0424ce2 100644 --- a/build/distfiles/gostls13-debash-1.22.4.tar.zst.do +++ b/build/distfiles/gostls13-debash-1.22.4.tar.zst.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname=$1.do . "$BASS_ROOT"/lib/rc [ -d gostls13.git ] || git clone --depth 1 --bare git://git.cypherpunks.ru/gostls13.git >&2 cd gostls13.git diff --git a/build/distfiles/iniparser-v4.2.2.tar.zst.do b/build/distfiles/iniparser-v4.2.2.tar.zst.do index 1559c73..12591c0 100644 --- a/build/distfiles/iniparser-v4.2.2.tar.zst.do +++ b/build/distfiles/iniparser-v4.2.2.tar.zst.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname=$1.do . "$BASS_ROOT"/lib/rc [ -d iniparser.git ] || git clone --depth 1 --bare https://gitlab.com/iniparser/iniparser.git cd iniparser.git diff --git a/build/distfiles/libavif-v1.0.0-535-g7fbc20c.tar.zst.do b/build/distfiles/libavif-v1.0.0-535-g7fbc20c.tar.zst.do index 9a06391..825c619 100644 --- a/build/distfiles/libavif-v1.0.0-535-g7fbc20c.tar.zst.do +++ b/build/distfiles/libavif-v1.0.0-535-g7fbc20c.tar.zst.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname=$1.do . "$BASS_ROOT"/lib/rc [ -d libavif.git ] || git clone --depth 1 --bare https://github.com/AOMediaCodec/libavif.git >&2 cd libavif.git diff --git a/build/distfiles/libjxl-v0.10-snapshot-179-gcdb6a667.tar.zst.do b/build/distfiles/libjxl-v0.10-snapshot-179-gcdb6a667.tar.zst.do index 1b9480e..8e84f08 100644 --- a/build/distfiles/libjxl-v0.10-snapshot-179-gcdb6a667.tar.zst.do +++ b/build/distfiles/libjxl-v0.10-snapshot-179-gcdb6a667.tar.zst.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname=$1.do . "$BASS_ROOT"/lib/rc [ -d libjxl ] || git clone --depth 1 https://github.com/libjxl/libjxl.git >&2 cd libjxl diff --git a/build/distfiles/libtap-0.1.0-44-gb53e4ef.tar.zst.do b/build/distfiles/libtap-0.1.0-44-gb53e4ef.tar.zst.do index ec60153..5fb0751 100644 --- a/build/distfiles/libtap-0.1.0-44-gb53e4ef.tar.zst.do +++ b/build/distfiles/libtap-0.1.0-44-gb53e4ef.tar.zst.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname=$1.do . "$BASS_ROOT"/lib/rc [ -d libtap.git ] || git clone --depth 1 --bare https://github.com/zorgnax/libtap.git cd libtap.git diff --git a/build/distfiles/mod_tile-v0.7.0-58-gc3453bc.tar.zst.do b/build/distfiles/mod_tile-v0.7.0-58-gc3453bc.tar.zst.do index ba435af..2c9b796 100644 --- a/build/distfiles/mod_tile-v0.7.0-58-gc3453bc.tar.zst.do +++ b/build/distfiles/mod_tile-v0.7.0-58-gc3453bc.tar.zst.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname=$1.do . "$BASS_ROOT"/lib/rc [ -d mod_tile.git ] || git clone --depth 1 --bare https://github.com/openstreetmap/mod_tile.git cd mod_tile.git diff --git a/build/distfiles/mupdf-1.24.0-170-g05063f228.tar.zst.do b/build/distfiles/mupdf-1.24.0-170-g05063f228.tar.zst.do index 5544eb7..4bc3d86 100644 --- a/build/distfiles/mupdf-1.24.0-170-g05063f228.tar.zst.do +++ b/build/distfiles/mupdf-1.24.0-170-g05063f228.tar.zst.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname=$1.do . "$BASS_ROOT"/lib/rc [ -d mupdf ] || git clone --depth 1 https://github.com/ArtifexSoftware/mupdf.git >&2 cd mupdf diff --git a/build/distfiles/ninja-v1.12.1.tar.zst.do b/build/distfiles/ninja-v1.12.1.tar.zst.do index d15f527..4050ff1 100644 --- a/build/distfiles/ninja-v1.12.1.tar.zst.do +++ b/build/distfiles/ninja-v1.12.1.tar.zst.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname=$1.do . "$BASS_ROOT"/lib/rc [ -d ninja.git ] || git clone --depth 1 --bare https://github.com/ninja-build/ninja.git >&2 cd ninja.git diff --git a/build/distfiles/nsxiv-v32-11-g420a0a2.tar.zst.do b/build/distfiles/nsxiv-v32-11-g420a0a2.tar.zst.do index 86e67d0..753bb2c 100644 --- a/build/distfiles/nsxiv-v32-11-g420a0a2.tar.zst.do +++ b/build/distfiles/nsxiv-v32-11-g420a0a2.tar.zst.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname=$1.do . "$BASS_ROOT"/lib/rc [ -d nsxiv.git ] || git clone --depth 1 --bare https://github.com/nsxiv/nsxiv.git >&2 cd nsxiv.git diff --git a/build/distfiles/pack b/build/distfiles/pack index 8f64dad..08cd529 100755 --- a/build/distfiles/pack +++ b/build/distfiles/pack @@ -1,6 +1,6 @@ #!/bin/sh -e -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname="$0" . "$BASS_ROOT"/lib/rc cd "$DISTFILES" { diff --git a/build/distfiles/svt-av1-v2.1.0-12-gfcf56491.tar.zst.do b/build/distfiles/svt-av1-v2.1.0-12-gfcf56491.tar.zst.do index b9d970e..45d91a1 100644 --- a/build/distfiles/svt-av1-v2.1.0-12-gfcf56491.tar.zst.do +++ b/build/distfiles/svt-av1-v2.1.0-12-gfcf56491.tar.zst.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname=$1.do . "$BASS_ROOT"/lib/rc [ -d svt-av1.git ] || git clone --depth 1 --bare https://gitlab.com/AOMediaCodec/SVT-AV1.git svt-av1.git >&2 cd svt-av1.git diff --git a/build/lib/mk-pkg b/build/lib/mk-pkg index 16c6814..343977e 100755 --- a/build/lib/mk-pkg +++ b/build/lib/mk-pkg @@ -22,7 +22,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname="$0" . "$BASS_ROOT"/lib/rc BASS_BIRTHTIME="2024-02-12 14:08:37" diff --git a/build/lib/pkg-inst b/build/lib/pkg-inst index 14ddca8..049f4ac 100755 --- a/build/lib/pkg-inst +++ b/build/lib/pkg-inst @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname="$0" . "$BASS_ROOT"/lib/rc export PKG="$1" diff --git a/build/lib/pkg-rm b/build/lib/pkg-rm index 593a14f..b3f50db 100755 --- a/build/lib/pkg-rm +++ b/build/lib/pkg-rm @@ -1,7 +1,7 @@ #!/bin/sh -e # It is intended to be called by build/bin/pkg-rm. -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname="$0" . "$BASS_ROOT"/lib/rc export PKG="$1" diff --git a/build/pkg/cp-arch b/build/pkg/cp-arch index 9f003c5..ce786c9 100755 --- a/build/pkg/cp-arch +++ b/build/pkg/cp-arch @@ -4,7 +4,7 @@ # to $DST/$ARCH. It is intended to copy skelpkgs from build machine to # NFS shared directory. -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname="$0" . "$BASS_ROOT"/lib/rc dst="$(realpath -- "$1")" diff --git a/build/pkg/mk-arch b/build/pkg/mk-arch index f408d89..d8c70de 100755 --- a/build/pkg/mk-arch +++ b/build/pkg/mk-arch @@ -3,7 +3,7 @@ # Create specified $BASS_ROOT/build/pkg/$ARCH directory and fill it with all # skels from $BASS_ROOT/build/skel, by hardlinking them into. -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname="$0" . "$BASS_ROOT"/lib/rc [ -z "$1" ] || ARCH="$1" mkdir -p "$BASS_ROOT"/build/pkg/$ARCH diff --git a/build/skel/archivers/lzip-1.24.do b/build/skel/archivers/lzip-1.24.do index ea404db..f0429aa 100644 --- a/build/skel/archivers/lzip-1.24.do +++ b/build/skel/archivers/lzip-1.24.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/archivers/zstd.do b/build/skel/archivers/zstd.do index 284271e..20cd6bc 100644 --- a/build/skel/archivers/zstd.do +++ b/build/skel/archivers/zstd.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/audio/lame-3.100.do b/build/skel/audio/lame-3.100.do index 8f8c327..b4f3215 100644 --- a/build/skel/audio/lame-3.100.do +++ b/build/skel/audio/lame-3.100.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/audio/libopusenc-0.2.1.do b/build/skel/audio/libopusenc-0.2.1.do index 4f4e038..e25dad8 100644 --- a/build/skel/audio/libopusenc-0.2.1.do +++ b/build/skel/audio/libopusenc-0.2.1.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/audio/libsndfile-1.0.31.do b/build/skel/audio/libsndfile-1.0.31.do index 9d48954..d3b2a90 100644 --- a/build/skel/audio/libsndfile-1.0.31.do +++ b/build/skel/audio/libsndfile-1.0.31.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/audio/libvorbis-1.3.7.do b/build/skel/audio/libvorbis-1.3.7.do index 9e83932..00f5983 100644 --- a/build/skel/audio/libvorbis-1.3.7.do +++ b/build/skel/audio/libvorbis-1.3.7.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/audio/opus-1.5.2.do b/build/skel/audio/opus-1.5.2.do index ba21152..190b4fe 100644 --- a/build/skel/audio/opus-1.5.2.do +++ b/build/skel/audio/opus-1.5.2.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/audio/opus-tools-0.2.do b/build/skel/audio/opus-tools-0.2.do index 9919276..4c4f8d8 100644 --- a/build/skel/audio/opus-tools-0.2.do +++ b/build/skel/audio/opus-tools-0.2.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/audio/opusfile-0.12.do b/build/skel/audio/opusfile-0.12.do index da50b41..b70fb13 100644 --- a/build/skel/audio/opusfile-0.12.do +++ b/build/skel/audio/opusfile-0.12.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/audio/sox-14.4.2.do b/build/skel/audio/sox-14.4.2.do index 6cfc075..bfa6087 100644 --- a/build/skel/audio/sox-14.4.2.do +++ b/build/skel/audio/sox-14.4.2.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/audio/vorbis-tools-1.4.2.do b/build/skel/audio/vorbis-tools-1.4.2.do index 648a5f2..3ed6b85 100644 --- a/build/skel/audio/vorbis-tools-1.4.2.do +++ b/build/skel/audio/vorbis-tools-1.4.2.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/audio/wavpack-5.7.0.do b/build/skel/audio/wavpack-5.7.0.do index 1142770..8226c52 100644 --- a/build/skel/audio/wavpack-5.7.0.do +++ b/build/skel/audio/wavpack-5.7.0.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/crypto/age-v1.1.1-23-g29b68c2.do b/build/skel/crypto/age-v1.1.1-23-g29b68c2.do index 9754e53..921985d 100644 --- a/build/skel/crypto/age-v1.1.1-23-g29b68c2.do +++ b/build/skel/crypto/age-v1.1.1-23-g29b68c2.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/crypto/b3sum-1.5.0.do b/build/skel/crypto/b3sum-1.5.0.do index a094b4b..f55e629 100644 --- a/build/skel/crypto/b3sum-1.5.0.do +++ b/build/skel/crypto/b3sum-1.5.0.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/crypto/gnupg-2.4.5.do b/build/skel/crypto/gnupg-2.4.5.do index d1b6059..165078f 100644 --- a/build/skel/crypto/gnupg-2.4.5.do +++ b/build/skel/crypto/gnupg-2.4.5.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/crypto/gnutls-3.7.10.do b/build/skel/crypto/gnutls-3.7.10.do index c67edf1..0f178c1 100644 --- a/build/skel/crypto/gnutls-3.7.10.do +++ b/build/skel/crypto/gnutls-3.7.10.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/crypto/gosha3-v1.0.0.do b/build/skel/crypto/gosha3-v1.0.0.do index 5f576a6..c78e4da 100644 --- a/build/skel/crypto/gosha3-v1.0.0.do +++ b/build/skel/crypto/gosha3-v1.0.0.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/crypto/gpgme-1.23.2.do b/build/skel/crypto/gpgme-1.23.2.do index d337e59..d4e82ed 100644 --- a/build/skel/crypto/gpgme-1.23.2.do +++ b/build/skel/crypto/gpgme-1.23.2.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/crypto/hashers.do b/build/skel/crypto/hashers.do index 424e269..ee33d90 100644 --- a/build/skel/crypto/hashers.do +++ b/build/skel/crypto/hashers.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/crypto/libassuan-2.5.7.do b/build/skel/crypto/libassuan-2.5.7.do index 7fdb0b1..82476ab 100644 --- a/build/skel/crypto/libassuan-2.5.7.do +++ b/build/skel/crypto/libassuan-2.5.7.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/crypto/libgcrypt-1.10.3.do b/build/skel/crypto/libgcrypt-1.10.3.do index 2c1f306..abc7fe5 100644 --- a/build/skel/crypto/libgcrypt-1.10.3.do +++ b/build/skel/crypto/libgcrypt-1.10.3.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/crypto/libgpg-error-1.49.do b/build/skel/crypto/libgpg-error-1.49.do index 7fdb0b1..82476ab 100644 --- a/build/skel/crypto/libgpg-error-1.49.do +++ b/build/skel/crypto/libgpg-error-1.49.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/crypto/libksba-1.6.6.do b/build/skel/crypto/libksba-1.6.6.do index 354b2b1..e43ce6d 100644 --- a/build/skel/crypto/libksba-1.6.6.do +++ b/build/skel/crypto/libksba-1.6.6.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/crypto/nettle-3.9.1.do b/build/skel/crypto/nettle-3.9.1.do index 734b0e4..84f45d0 100644 --- a/build/skel/crypto/nettle-3.9.1.do +++ b/build/skel/crypto/nettle-3.9.1.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/crypto/npth-1.7.do b/build/skel/crypto/npth-1.7.do index b7318c9..f1aeda8 100644 --- a/build/skel/crypto/npth-1.7.do +++ b/build/skel/crypto/npth-1.7.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/crypto/openssl-1.1.1w.do b/build/skel/crypto/openssl-1.1.1w.do index 7ec8249..00d5008 100644 --- a/build/skel/crypto/openssl-1.1.1w.do +++ b/build/skel/crypto/openssl-1.1.1w.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/crypto/pinentry-1.3.0.do b/build/skel/crypto/pinentry-1.3.0.do index 0510f06..8c10428 100644 --- a/build/skel/crypto/pinentry-1.3.0.do +++ b/build/skel/crypto/pinentry-1.3.0.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/crypto/xxhash-v0.8.2.do b/build/skel/crypto/xxhash-v0.8.2.do index d8b17be..d571c1e 100644 --- a/build/skel/crypto/xxhash-v0.8.2.do +++ b/build/skel/crypto/xxhash-v0.8.2.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/databases/db-service.do b/build/skel/databases/db-service.do index e65f812..e505496 100644 --- a/build/skel/databases/db-service.do +++ b/build/skel/databases/db-service.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/databases/postgresql-11.22.do b/build/skel/databases/postgresql-11.22.do index 10726c4..1003bcb 100644 --- a/build/skel/databases/postgresql-11.22.do +++ b/build/skel/databases/postgresql-11.22.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/databases/postgresql-11.22_and_postgis-2.5.9.do b/build/skel/databases/postgresql-11.22_and_postgis-2.5.9.do index 8884514..2602bbb 100644 --- a/build/skel/databases/postgresql-11.22_and_postgis-2.5.9.do +++ b/build/skel/databases/postgresql-11.22_and_postgis-2.5.9.do @@ -1,7 +1,7 @@ # PostGIS loves to install itself directly to PostgreSQL, # so that is why this is combined skel -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/databases/recoll-1.37.0.do b/build/skel/databases/recoll-1.37.0.do index ffe37b4..36ceecd 100644 --- a/build/skel/databases/recoll-1.37.0.do +++ b/build/skel/databases/recoll-1.37.0.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/databases/recutils-1.9.do b/build/skel/databases/recutils-1.9.do index 87544a7..b37cfac 100644 --- a/build/skel/databases/recutils-1.9.do +++ b/build/skel/databases/recutils-1.9.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/databases/sqlite-3450100.do b/build/skel/databases/sqlite-3450100.do index 81411a7..37ae01d 100644 --- a/build/skel/databases/sqlite-3450100.do +++ b/build/skel/databases/sqlite-3450100.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/databases/xapian-core-1.4.25.do b/build/skel/databases/xapian-core-1.4.25.do index 0c1e2e6..37637d6 100644 --- a/build/skel/databases/xapian-core-1.4.25.do +++ b/build/skel/databases/xapian-core-1.4.25.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/deskutils/remind-05.00.01.do b/build/skel/deskutils/remind-05.00.01.do index c2f9449..9217b0c 100644 --- a/build/skel/deskutils/remind-05.00.01.do +++ b/build/skel/deskutils/remind-05.00.01.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/devel/autotools.do b/build/skel/devel/autotools.do index 721f325..24ac8c8 100644 --- a/build/skel/devel/autotools.do +++ b/build/skel/devel/autotools.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/devel/boost_1_74_0.do b/build/skel/devel/boost_1_74_0.do index eb77ec6..58b4bb5 100644 --- a/build/skel/devel/boost_1_74_0.do +++ b/build/skel/devel/boost_1_74_0.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/devel/cmake-3.28.3.do b/build/skel/devel/cmake-3.28.3.do index a68d349..caa6aec 100644 --- a/build/skel/devel/cmake-3.28.3.do +++ b/build/skel/devel/cmake-3.28.3.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/devel/getopt-1.1.6.do b/build/skel/devel/getopt-1.1.6.do index 4ce0bb8..0e83c69 100644 --- a/build/skel/devel/getopt-1.1.6.do +++ b/build/skel/devel/getopt-1.1.6.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/devel/git-2.45.2.do b/build/skel/devel/git-2.45.2.do index 8470f38..65b415b 100644 --- a/build/skel/devel/git-2.45.2.do +++ b/build/skel/devel/git-2.45.2.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/devel/git-full-2.45.2.do b/build/skel/devel/git-full-2.45.2.do index 55fca13..368709d 100644 --- a/build/skel/devel/git-full-2.45.2.do +++ b/build/skel/devel/git-full-2.45.2.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/devel/git-minimal-2.45.2.do b/build/skel/devel/git-minimal-2.45.2.do index 85eaf74..a454a34 100644 --- a/build/skel/devel/git-minimal-2.45.2.do +++ b/build/skel/devel/git-minimal-2.45.2.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/devel/gmake-4.4.1.do b/build/skel/devel/gmake-4.4.1.do index d4b46be..7442356 100644 --- a/build/skel/devel/gmake-4.4.1.do +++ b/build/skel/devel/gmake-4.4.1.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/devel/go-stringer-0.18.0.do b/build/skel/devel/go-stringer-0.18.0.do index b799b7e..903ce81 100644 --- a/build/skel/devel/go-stringer-0.18.0.do +++ b/build/skel/devel/go-stringer-0.18.0.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/devel/goredo-2.6.2.do b/build/skel/devel/goredo-2.6.2.do index fd062c5..20bee0b 100644 --- a/build/skel/devel/goredo-2.6.2.do +++ b/build/skel/devel/goredo-2.6.2.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/devel/iniparser-v4.2.2.do b/build/skel/devel/iniparser-v4.2.2.do index b385218..b041cb5 100644 --- a/build/skel/devel/iniparser-v4.2.2.do +++ b/build/skel/devel/iniparser-v4.2.2.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/devel/libedit-20230828-3.1.do b/build/skel/devel/libedit-20230828-3.1.do index cec9671..5509294 100644 --- a/build/skel/devel/libedit-20230828-3.1.do +++ b/build/skel/devel/libedit-20230828-3.1.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/devel/libevent-2.1.12.do b/build/skel/devel/libevent-2.1.12.do index 9725973..9049381 100644 --- a/build/skel/devel/libevent-2.1.12.do +++ b/build/skel/devel/libevent-2.1.12.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/devel/libiconv-1.17.do b/build/skel/devel/libiconv-1.17.do index 03155fb..0b5cc05 100644 --- a/build/skel/devel/libiconv-1.17.do +++ b/build/skel/devel/libiconv-1.17.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/devel/libtap-0.1.0-44-gb53e4ef.do b/build/skel/devel/libtap-0.1.0-44-gb53e4ef.do index df14154..69582dd 100644 --- a/build/skel/devel/libtap-0.1.0-44-gb53e4ef.do +++ b/build/skel/devel/libtap-0.1.0-44-gb53e4ef.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/devel/nasm-2.16.01.do b/build/skel/devel/nasm-2.16.01.do index 725d0a0..2e2fa5e 100644 --- a/build/skel/devel/nasm-2.16.01.do +++ b/build/skel/devel/nasm-2.16.01.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/devel/ncurses-6.4.do b/build/skel/devel/ncurses-6.4.do index e45e296..dc9b5d8 100644 --- a/build/skel/devel/ncurses-6.4.do +++ b/build/skel/devel/ncurses-6.4.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/devel/ninja-v1.12.1.do b/build/skel/devel/ninja-v1.12.1.do index cc0a55d..a6f1407 100644 --- a/build/skel/devel/ninja-v1.12.1.do +++ b/build/skel/devel/ninja-v1.12.1.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/devel/pcre2-10.44.do b/build/skel/devel/pcre2-10.44.do index 56e7586..58740c1 100644 --- a/build/skel/devel/pcre2-10.44.do +++ b/build/skel/devel/pcre2-10.44.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/devel/pkgconf-2.1.1.do b/build/skel/devel/pkgconf-2.1.1.do index b4cef45..cb8a0c4 100644 --- a/build/skel/devel/pkgconf-2.1.1.do +++ b/build/skel/devel/pkgconf-2.1.1.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/devel/sharness-1.2.0.do b/build/skel/devel/sharness-1.2.0.do index dd2773a..e94cf27 100644 --- a/build/skel/devel/sharness-1.2.0.do +++ b/build/skel/devel/sharness-1.2.0.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/dns/dq-20240101.do b/build/skel/dns/dq-20240101.do index 1bffb34..647453b 100644 --- a/build/skel/dns/dq-20240101.do +++ b/build/skel/dns/dq-20240101.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/dns/libidn2-2.3.7.do b/build/skel/dns/libidn2-2.3.7.do index cc6dc9b..ed357c2 100644 --- a/build/skel/dns/libidn2-2.3.7.do +++ b/build/skel/dns/libidn2-2.3.7.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/graphics/cairo-1.16.0.do b/build/skel/graphics/cairo-1.16.0.do index 6099652..e0aaac4 100644 --- a/build/skel/graphics/cairo-1.16.0.do +++ b/build/skel/graphics/cairo-1.16.0.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/graphics/djvulibre-3.5.28.do b/build/skel/graphics/djvulibre-3.5.28.do index c2f9449..9217b0c 100644 --- a/build/skel/graphics/djvulibre-3.5.28.do +++ b/build/skel/graphics/djvulibre-3.5.28.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/graphics/freetype-2.9.1.do b/build/skel/graphics/freetype-2.9.1.do index eeb67fa..261b8c4 100644 --- a/build/skel/graphics/freetype-2.9.1.do +++ b/build/skel/graphics/freetype-2.9.1.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/graphics/gdal-2.4.4.do b/build/skel/graphics/gdal-2.4.4.do index 4c984af..927d12f 100644 --- a/build/skel/graphics/gdal-2.4.4.do +++ b/build/skel/graphics/gdal-2.4.4.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/graphics/geos-3.12.1.do b/build/skel/graphics/geos-3.12.1.do index bab8cfb..b4e5654 100644 --- a/build/skel/graphics/geos-3.12.1.do +++ b/build/skel/graphics/geos-3.12.1.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/graphics/ghostscript-10.03.1.do b/build/skel/graphics/ghostscript-10.03.1.do index 305876f..aed35ba 100644 --- a/build/skel/graphics/ghostscript-10.03.1.do +++ b/build/skel/graphics/ghostscript-10.03.1.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/graphics/harfbuzz-8.5.0.do b/build/skel/graphics/harfbuzz-8.5.0.do index 0e0c425..31a57a7 100644 --- a/build/skel/graphics/harfbuzz-8.5.0.do +++ b/build/skel/graphics/harfbuzz-8.5.0.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/graphics/imlib2-1.12.2.do b/build/skel/graphics/imlib2-1.12.2.do index 4fc1f67..f184ab1 100644 --- a/build/skel/graphics/imlib2-1.12.2.do +++ b/build/skel/graphics/imlib2-1.12.2.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/graphics/libavif-v1.0.0-535-g7fbc20c.do b/build/skel/graphics/libavif-v1.0.0-535-g7fbc20c.do index c0b6f2d..8405f21 100644 --- a/build/skel/graphics/libavif-v1.0.0-535-g7fbc20c.do +++ b/build/skel/graphics/libavif-v1.0.0-535-g7fbc20c.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/graphics/libjpeg-turbo-1.5.2.do b/build/skel/graphics/libjpeg-turbo-1.5.2.do index 76f9f32..3c57d48 100644 --- a/build/skel/graphics/libjpeg-turbo-1.5.2.do +++ b/build/skel/graphics/libjpeg-turbo-1.5.2.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/graphics/libjxl-v0.10-snapshot-179-gcdb6a667.do b/build/skel/graphics/libjxl-v0.10-snapshot-179-gcdb6a667.do index 3c8491e..46ca05a 100644 --- a/build/skel/graphics/libjxl-v0.10-snapshot-179-gcdb6a667.do +++ b/build/skel/graphics/libjxl-v0.10-snapshot-179-gcdb6a667.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/graphics/libpng-1.6.43.do b/build/skel/graphics/libpng-1.6.43.do index 363bd12..c0a5563 100644 --- a/build/skel/graphics/libpng-1.6.43.do +++ b/build/skel/graphics/libpng-1.6.43.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/graphics/libwebp-1.4.0.do b/build/skel/graphics/libwebp-1.4.0.do index ddbbb71..726086d 100644 --- a/build/skel/graphics/libwebp-1.4.0.do +++ b/build/skel/graphics/libwebp-1.4.0.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/graphics/mapnik-v3.1.0.do b/build/skel/graphics/mapnik-v3.1.0.do index c2efa81..1dc4616 100644 --- a/build/skel/graphics/mapnik-v3.1.0.do +++ b/build/skel/graphics/mapnik-v3.1.0.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/graphics/mod_tile-v0.7.0-58-gc3453bc.do b/build/skel/graphics/mod_tile-v0.7.0-58-gc3453bc.do index 4910b3e..1612455 100644 --- a/build/skel/graphics/mod_tile-v0.7.0-58-gc3453bc.do +++ b/build/skel/graphics/mod_tile-v0.7.0-58-gc3453bc.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/graphics/mupdf-1.24.0-170-g05063f228.do b/build/skel/graphics/mupdf-1.24.0-170-g05063f228.do index 4cc43ae..7b74db2 100644 --- a/build/skel/graphics/mupdf-1.24.0-170-g05063f228.do +++ b/build/skel/graphics/mupdf-1.24.0-170-g05063f228.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/graphics/nsxiv-v32-11-g420a0a2.do b/build/skel/graphics/nsxiv-v32-11-g420a0a2.do index 25bffa3..2c9dad0 100644 --- a/build/skel/graphics/nsxiv-v32-11-g420a0a2.do +++ b/build/skel/graphics/nsxiv-v32-11-g420a0a2.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/graphics/pixman-0.40.0.do b/build/skel/graphics/pixman-0.40.0.do index 55daf77..7cd8381 100644 --- a/build/skel/graphics/pixman-0.40.0.do +++ b/build/skel/graphics/pixman-0.40.0.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/graphics/proj-4.9.3.do b/build/skel/graphics/proj-4.9.3.do index e98321b..0882a51 100644 --- a/build/skel/graphics/proj-4.9.3.do +++ b/build/skel/graphics/proj-4.9.3.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/graphics/zathura-0.5.2.do b/build/skel/graphics/zathura-0.5.2.do index f521ec5..2fdf670 100644 --- a/build/skel/graphics/zathura-0.5.2.do +++ b/build/skel/graphics/zathura-0.5.2.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/lang/Python-3.10.13.do b/build/skel/lang/Python-3.10.13.do index ab6230e..7da8f2f 100644 --- a/build/skel/lang/Python-3.10.13.do +++ b/build/skel/lang/Python-3.10.13.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/lang/Python-3.7.3.do b/build/skel/lang/Python-3.7.3.do index a5143d8..0421c0c 100644 --- a/build/skel/lang/Python-3.7.3.do +++ b/build/skel/lang/Python-3.7.3.do @@ -1,7 +1,7 @@ # Beware: Python tries to create hard-links on a filesystem, so be sure # that they are working (or override TMPDIR to somewhere they work) -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/lang/gcc-4.7.4.do b/build/skel/lang/gcc-4.7.4.do index 23a69e9..98f6f25 100644 --- a/build/skel/lang/gcc-4.7.4.do +++ b/build/skel/lang/gcc-4.7.4.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/lang/gcc-8.5.0.do b/build/skel/lang/gcc-8.5.0.do index ff1c7c8..a3b30e5 100644 --- a/build/skel/lang/gcc-8.5.0.do +++ b/build/skel/lang/gcc-8.5.0.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/lang/gm4-1.4.19.do b/build/skel/lang/gm4-1.4.19.do index 89ce107..8c79df3 100644 --- a/build/skel/lang/gm4-1.4.19.do +++ b/build/skel/lang/gm4-1.4.19.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/lang/go1.17.13.do b/build/skel/lang/go1.17.13.do index 98bfe98..902cf97 100644 --- a/build/skel/lang/go1.17.13.do +++ b/build/skel/lang/go1.17.13.do @@ -1,6 +1,6 @@ # FreeBSD may require disabling ASLR (kern.elf64.aslr.enable=0) -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/lang/go1.20.14.do b/build/skel/lang/go1.20.14.do index 670df22..5ab9528 100644 --- a/build/skel/lang/go1.20.14.do +++ b/build/skel/lang/go1.20.14.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/lang/go1.22.4.do b/build/skel/lang/go1.22.4.do index c54f513..133aad0 100644 --- a/build/skel/lang/go1.22.4.do +++ b/build/skel/lang/go1.22.4.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/lang/go1.4.3.do b/build/skel/lang/go1.4.3.do index b5f290c..8f434a2 100644 --- a/build/skel/lang/go1.4.3.do +++ b/build/skel/lang/go1.4.3.do @@ -19,7 +19,7 @@ # cd /tmp/fbsd12-chroot/root/go/src # ./make.bash --no-clean -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/lang/perl-5.32.1.do b/build/skel/lang/perl-5.32.1.do index 1c82105..b48d19d 100644 --- a/build/skel/lang/perl-5.32.1.do +++ b/build/skel/lang/perl-5.32.1.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/lang/tcl8.6.14.do b/build/skel/lang/tcl8.6.14.do index 1dd6e94..4698e8e 100644 --- a/build/skel/lang/tcl8.6.14.do +++ b/build/skel/lang/tcl8.6.14.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/math/gmp-6.3.0.do b/build/skel/math/gmp-6.3.0.do index ed6d4f7..f92c9d2 100644 --- a/build/skel/math/gmp-6.3.0.do +++ b/build/skel/math/gmp-6.3.0.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/math/mpc-1.3.1.do b/build/skel/math/mpc-1.3.1.do index 9860c31..98294f5 100644 --- a/build/skel/math/mpc-1.3.1.do +++ b/build/skel/math/mpc-1.3.1.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/math/mpfr-4.2.1.do b/build/skel/math/mpfr-4.2.1.do index 375941a..deda564 100644 --- a/build/skel/math/mpfr-4.2.1.do +++ b/build/skel/math/mpfr-4.2.1.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/misc/gocheese-4.2.0.do b/build/skel/misc/gocheese-4.2.0.do index 14dee6f..1ba606a 100644 --- a/build/skel/misc/gocheese-4.2.0.do +++ b/build/skel/misc/gocheese-4.2.0.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/misc/supercat-0.5.8.do b/build/skel/misc/supercat-0.5.8.do index 98d5bcc..64a01b5 100644 --- a/build/skel/misc/supercat-0.5.8.do +++ b/build/skel/misc/supercat-0.5.8.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/multimedia/dav1d-1.4.2-8-gda2cc78.do b/build/skel/multimedia/dav1d-1.4.2-8-gda2cc78.do index c254c7d..be099cc 100644 --- a/build/skel/multimedia/dav1d-1.4.2-8-gda2cc78.do +++ b/build/skel/multimedia/dav1d-1.4.2-8-gda2cc78.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/multimedia/ffmpeg-7.0.1.do b/build/skel/multimedia/ffmpeg-7.0.1.do index b38f85f..7ea2fa3 100644 --- a/build/skel/multimedia/ffmpeg-7.0.1.do +++ b/build/skel/multimedia/ffmpeg-7.0.1.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/multimedia/ffmpeg-doc-7.0.1.do b/build/skel/multimedia/ffmpeg-doc-7.0.1.do index 12388b0..35c1b1c 100644 --- a/build/skel/multimedia/ffmpeg-doc-7.0.1.do +++ b/build/skel/multimedia/ffmpeg-doc-7.0.1.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/multimedia/libogg-1.3.5.do b/build/skel/multimedia/libogg-1.3.5.do index 1142770..8226c52 100644 --- a/build/skel/multimedia/libogg-1.3.5.do +++ b/build/skel/multimedia/libogg-1.3.5.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/multimedia/svt-av1-v2.1.0-12-gfcf56491.do b/build/skel/multimedia/svt-av1-v2.1.0-12-gfcf56491.do index d2bd49c..827e7ec 100644 --- a/build/skel/multimedia/svt-av1-v2.1.0-12-gfcf56491.do +++ b/build/skel/multimedia/svt-av1-v2.1.0-12-gfcf56491.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/py-some-venv.do b/build/skel/py-some-venv.do index 04696d1..7bc8571 100644 --- a/build/skel/py-some-venv.do +++ b/build/skel/py-some-venv.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/rc-paths.do b/build/skel/rc-paths.do index 0cf83d8..a1bb401 100644 --- a/build/skel/rc-paths.do +++ b/build/skel/rc-paths.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/shells/bash-5.2.21.do b/build/skel/shells/bash-5.2.21.do index a5800ab..340c156 100644 --- a/build/skel/shells/bash-5.2.21.do +++ b/build/skel/shells/bash-5.2.21.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/shells/zsh-5.9.do b/build/skel/shells/zsh-5.9.do index e72e412..f0ea0e7 100644 --- a/build/skel/shells/zsh-5.9.do +++ b/build/skel/shells/zsh-5.9.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/slave-base.do b/build/skel/slave-base.do index 6d11061..9467442 100644 --- a/build/skel/slave-base.do +++ b/build/skel/slave-base.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/stow.do b/build/skel/stow.do index 88535a2..5571b9d 100644 --- a/build/skel/stow.do +++ b/build/skel/stow.do @@ -2,7 +2,7 @@ # system itself, because pkg-inst requires stow, that we are going to # build. Perl is used from the base OS. -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/sysutils/daemontools-encore-1.11.do b/build/skel/sysutils/daemontools-encore-1.11.do index 2950083..e04d6fb 100644 --- a/build/skel/sysutils/daemontools-encore-1.11.do +++ b/build/skel/sysutils/daemontools-encore-1.11.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/sysutils/less-643.do b/build/skel/sysutils/less-643.do index 5a9ea87..423d179 100644 --- a/build/skel/sysutils/less-643.do +++ b/build/skel/sysutils/less-643.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/sysutils/meta4ra-0.9.0.do b/build/skel/sysutils/meta4ra-0.9.0.do index f75fae3..dd21e4a 100644 --- a/build/skel/sysutils/meta4ra-0.9.0.do +++ b/build/skel/sysutils/meta4ra-0.9.0.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/sysutils/parallel-20240122.do b/build/skel/sysutils/parallel-20240122.do index b15932e..f971afa 100644 --- a/build/skel/sysutils/parallel-20240122.do +++ b/build/skel/sysutils/parallel-20240122.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/sysutils/tmux-3.3.do b/build/skel/sysutils/tmux-3.3.do index db683b9..496fb2d 100644 --- a/build/skel/sysutils/tmux-3.3.do +++ b/build/skel/sysutils/tmux-3.3.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/sysutils/ucspi-tcp-0.88.do b/build/skel/sysutils/ucspi-tcp-0.88.do index 05f04d3..06b007c 100644 --- a/build/skel/sysutils/ucspi-tcp-0.88.do +++ b/build/skel/sysutils/ucspi-tcp-0.88.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/textproc/expat-2.6.2.do b/build/skel/textproc/expat-2.6.2.do index 50cb8dd..6cb7531 100644 --- a/build/skel/textproc/expat-2.6.2.do +++ b/build/skel/textproc/expat-2.6.2.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/textproc/gnu-grep-3.11.do b/build/skel/textproc/gnu-grep-3.11.do index 9ac0bc4..4d198a9 100644 --- a/build/skel/textproc/gnu-grep-3.11.do +++ b/build/skel/textproc/gnu-grep-3.11.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/textproc/icu4c-63.do b/build/skel/textproc/icu4c-63.do index 0fe64e7..38df0bc 100644 --- a/build/skel/textproc/icu4c-63.do +++ b/build/skel/textproc/icu4c-63.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/textproc/icu4c-75.do b/build/skel/textproc/icu4c-75.do index f78a514..59d206a 100644 --- a/build/skel/textproc/icu4c-75.do +++ b/build/skel/textproc/icu4c-75.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../... +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../... sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/textproc/libxml2-2.9.14.do b/build/skel/textproc/libxml2-2.9.14.do index 83efe2e..6fbcc9c 100644 --- a/build/skel/textproc/libxml2-2.9.14.do +++ b/build/skel/textproc/libxml2-2.9.14.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/textproc/texinfo-7.1.do b/build/skel/textproc/texinfo-7.1.do index fbb9fa5..67a90f8 100644 --- a/build/skel/textproc/texinfo-7.1.do +++ b/build/skel/textproc/texinfo-7.1.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/textproc/xmlto-0.0.26.do b/build/skel/textproc/xmlto-0.0.26.do index 0d56fce..a600c92 100644 --- a/build/skel/textproc/xmlto-0.0.26.do +++ b/build/skel/textproc/xmlto-0.0.26.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/www/angie-1.5.0.do b/build/skel/www/angie-1.5.0.do index 4ed89b8..05e7684 100644 --- a/build/skel/www/angie-1.5.0.do +++ b/build/skel/www/angie-1.5.0.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/www/angie-service.do b/build/skel/www/angie-service.do index e464965..24763b1 100644 --- a/build/skel/www/angie-service.do +++ b/build/skel/www/angie-service.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/www/apr-1.7.4.do b/build/skel/www/apr-1.7.4.do index 4322960..4926aa5 100644 --- a/build/skel/www/apr-1.7.4.do +++ b/build/skel/www/apr-1.7.4.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/www/apr-util-1.6.3.do b/build/skel/www/apr-util-1.6.3.do index 086a66c..a22a7c4 100644 --- a/build/skel/www/apr-util-1.6.3.do +++ b/build/skel/www/apr-util-1.6.3.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/www/curl-8.7.1.do b/build/skel/www/curl-8.7.1.do index f373fc4..f55e1d6 100644 --- a/build/skel/www/curl-8.7.1.do +++ b/build/skel/www/curl-8.7.1.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/www/curl-with-tls-8.7.1.do b/build/skel/www/curl-with-tls-8.7.1.do index 0ecf45e..697cf41 100644 --- a/build/skel/www/curl-with-tls-8.7.1.do +++ b/build/skel/www/curl-with-tls-8.7.1.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/build/skel/www/httpd-2.4.59.do b/build/skel/www/httpd-2.4.59.do index 7c336db..8270ffd 100644 --- a/build/skel/www/httpd-2.4.59.do +++ b/build/skel/www/httpd-2.4.59.do @@ -1,4 +1,4 @@ -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/doc/build/tutorial.texi b/doc/build/tutorial.texi index 2d4f77b..76812b8 100644 --- a/doc/build/tutorial.texi +++ b/doc/build/tutorial.texi @@ -5,7 +5,7 @@ One of the most trivial and simple skel of hello world program can be made with the following skel in @file{skel/hw.do}: @example -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc @@ -86,7 +86,7 @@ $ meta4ra-create \ @item Write the skel file @file{skel/sysutils/parallel-20240122.do} itself: @example -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$1.do . "$BASS_ROOT"/lib/rc . "$BASS_ROOT"/build/skel/common.rc diff --git a/doc/ci/slave.texi b/doc/ci/slave.texi index 33f2560..283bd6d 100644 --- a/doc/ci/slave.texi +++ b/doc/ci/slave.texi @@ -11,7 +11,7 @@ and execute them. @command{slave/bin/task-taker} is used for that task: @example -$ export BASS_ROOT=/path/to/bass BASS_RC=/path/to/rc +$ [ -n "$BASS_ROOT" ] || BASS_ROOT=/path/to/bass BASS_RC=/path/to/rc $ $BASS_ROOT/slave/bin/task-taker @end example diff --git a/lib/rc b/lib/rc index 96a2dda..e49bc09 100644 --- a/lib/rc +++ b/lib/rc @@ -6,6 +6,7 @@ if [ -z "$BASS_ROOT" ] || [ -z "$sname" ] ; then echo '"BASS_ROOT"' and '"sname"' must be set by invoking script >&2 exit 1 fi +export BASS_ROOT NAME="$(basename -- "${sname%.do}")" # name of the skel SPATH="$(realpath $sname)" # absolute path to invoking script diff --git a/master/bin/clone-with-ctr b/master/bin/clone-with-ctr index a361c40..1708e25 100755 --- a/master/bin/clone-with-ctr +++ b/master/bin/clone-with-ctr @@ -4,7 +4,7 @@ # Copy "src" to "${ctr}${dst}" directories. That scripts assures all # necessary fsync-s are called and files are in read-only mode. -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname="$0" . $BASS_ROOT/lib/rc src="$1" diff --git a/master/bin/ctr-get b/master/bin/ctr-get index 39cbdfb..771d46f 100755 --- a/master/bin/ctr-get +++ b/master/bin/ctr-get @@ -11,7 +11,7 @@ # succeeds, then that value is taken (printed out). Also that script # tidies "dir" from old counter values. -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname="$0" . $BASS_ROOT/lib/rc cd ${1:-$TASKS/ctr} diff --git a/master/bin/notify-non-started b/master/bin/notify-non-started index bc660af..f51a323 100755 --- a/master/bin/notify-non-started +++ b/master/bin/notify-non-started @@ -2,7 +2,7 @@ setopt ERR_EXIT PIPE_FAIL -export BASS_ROOT=$0:a:h:h +[ -n "$BASS_ROOT" ] || BASS_ROOT=$0:a:h:h sname="$0" . $BASS_ROOT/lib/rc zmodload -F zsh/stat b:zstat diff --git a/master/bin/notify-non-taken b/master/bin/notify-non-taken index 9dcc625..65bf332 100755 --- a/master/bin/notify-non-taken +++ b/master/bin/notify-non-taken @@ -2,7 +2,7 @@ setopt ERR_EXIT PIPE_FAIL -export BASS_ROOT=$0:a:h:h +[ -n "$BASS_ROOT" ] || BASS_ROOT=$0:a:h:h sname=$0 . $BASS_ROOT/lib/rc zmodload -F zsh/stat b:zstat diff --git a/master/bin/reporter b/master/bin/reporter index 8dc4889..6066991 100755 --- a/master/bin/reporter +++ b/master/bin/reporter @@ -16,7 +16,7 @@ setopt ERR_EXIT PIPE_FAIL -export BASS_ROOT=$0:a:h:h:h +[ -n "$BASS_ROOT" ] || BASS_ROOT=$0:a:h:h:h sname=$0 . $BASS_ROOT/lib/rc ALIVE_TIMEOUT=60 diff --git a/slave/bin/job-starter b/slave/bin/job-starter index 83efb31..e048a61 100755 --- a/slave/bin/job-starter +++ b/slave/bin/job-starter @@ -18,7 +18,7 @@ task="$1" [ -d "$task" ] -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname="$0" . $BASS_ROOT/lib/rc FAILED_JOB_WAITTIME=${FAILED_JOB_WAITTIME:-3600} diff --git a/slave/bin/steps-runner b/slave/bin/steps-runner index fe840f8..fc553e4 100755 --- a/slave/bin/steps-runner +++ b/slave/bin/steps-runner @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname="$0" . $BASS_ROOT/lib/rc [ -n "$BASS_CODE" ] diff --git a/slave/bin/task-taker b/slave/bin/task-taker index 7de0da9..aadcd4a 100755 --- a/slave/bin/task-taker +++ b/slave/bin/task-taker @@ -20,7 +20,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -export BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. +[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname="$0" . $BASS_ROOT/lib/rc LASTNUM=${LASTNUM:-lastnum} diff --git a/slave/service/task-taker/run b/slave/service/task-taker/run index c1db9b6..8947663 100755 --- a/slave/service/task-taker/run +++ b/slave/service/task-taker/run @@ -1,6 +1,6 @@ #!/bin/sh -e -export BASS_ROOT=$HOME/bass +[ -n "$BASS_ROOT" ] || BASS_ROOT=$HOME/bass export BASS_RC=$BASS_ROOT/slave/rc $BASS_ROOT/slave/bin/task-taker || { $BASS_ROOT/bin/notify "Failed task-taker" <