summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar jet tsang zeon-git <zeon-git@jettsang.com> 2022-06-17 12:19:57 +0800
committerGravatar jet tsang zeon-git <zeon-git@jettsang.com> 2022-06-17 12:19:57 +0800
commitdeb057c99fcb31335c6c839945d9d3d4583838cb (patch)
tree70baa87652a96a1ab530626bd269170a07b654fe /src
parentadd yahoo's ipv6 range (diff)
downloadnetwork-toolchain-deb057c99fcb31335c6c839945d9d3d4583838cb.tar.gz
network-toolchain-deb057c99fcb31335c6c839945d9d3d4583838cb.tar.bz2
network-toolchain-deb057c99fcb31335c6c839945d9d3d4583838cb.zip
make bash and zsh-compatible
Signed-off-by: jet tsang zeon-git <zeon-git@jettsang.com>
Diffstat (limited to 'src')
-rwxr-xr-xsrc/badvpn.sh2
-rwxr-xr-xsrc/lib.sh3
-rwxr-xr-xsrc/ssu.sh2
-rwxr-xr-xsrc/wg.sh2
4 files changed, 4 insertions, 5 deletions
diff --git a/src/badvpn.sh b/src/badvpn.sh
index ee85e22..b4c071f 100755
--- a/src/badvpn.sh
+++ b/src/badvpn.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-LIBROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+LIBROOT="$(cd "$(dirname "${BASH_SOURCE[0]:-${(%):-%x}}")" && pwd)"
BINPATH=$LIBROOT/../bin
PKGPATH=$LIBROOT/../pkg
IPLISTPATH=$LIBROOT/../iplist
diff --git a/src/lib.sh b/src/lib.sh
index 556b1b3..9216e61 100755
--- a/src/lib.sh
+++ b/src/lib.sh
@@ -1,9 +1,8 @@
#!/bin/bash
ARCHITECTURE=$(uname -m)
OSNAME=$(uname)
-LIBROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+LIBROOT="$(cd "$(dirname "${BASH_SOURCE[0]:-${(%):-%x}}")" && pwd)"
IPLISTPATH=$LIBROOT/../iplist
-echo "IPLISTPATH:" $IPLISTPATH
OSRELEASE=""
case $ARCHITECTURE in
diff --git a/src/ssu.sh b/src/ssu.sh
index b0a4020..91df74c 100755
--- a/src/ssu.sh
+++ b/src/ssu.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-LIBROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+LIBROOT="$(cd "$(dirname "${BASH_SOURCE[0]:-${(%):-%x}}")" && pwd)"
BINPATH=$LIBROOT/../bin
IPLISTPATH=$LIBROOT/../iplist
V2RAY_PLUGIN_BIN_PATH="$BINPATH/v2ray-plugin_$WORDSTUFFIX"
diff --git a/src/wg.sh b/src/wg.sh
index fb9949c..8ed0098 100755
--- a/src/wg.sh
+++ b/src/wg.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-LIBROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+LIBROOT="$(cd "$(dirname "${BASH_SOURCE[0]:-${(%):-%x}}")" && pwd)"
function wg::install() {
case $OSRELEASE in
ubuntu)