rename bin/ to shared/ and make scripts relocatable

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

7 files changed, 7 insertions, 7 deletions

diff --git a/diffindex.sh b/diffindex.sh
index c8fd58b..ce8752b 100755
--- a/diffindex.sh
+++ b/diffindex.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ./bin/functions.sh
+. ./shared/functions.sh
 
 for target in $(fetch_remote_targets); do
 	for feed in $(fetch_remote_feeds "$target"); do
diff --git a/pkgupdate.sh b/pkgupdate.sh
index 4513a6d..84563c6 100755
--- a/pkgupdate.sh
+++ b/pkgupdate.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ./bin/functions.sh
+. ./shared/functions.sh
 
 terminate() {
 	local jobs="$(jobs -p)"
diff --git a/bin/functions.sh b/shared/functions.sh
index f168581..5e04ebe 100755
--- a/bin/functions.sh
+++ b/shared/functions.sh
@@ -7,7 +7,7 @@ IDENT="$HOME/.ssh/id_rsa_openwrt_rsync"
 PATTERN_SDK="OpenWrt-SDK-*.tar.bz2"
 PATTERN_FEED="Packages.gz"
 
-CACHE_DIR="$HOME/relman/.cache"
+CACHE_DIR="$(readlink -f .)/.cache"
 
 N="
 "
@@ -295,7 +295,7 @@ patch_index_cmd() {
 		zcat "$idir/Packages.gz" > "$odir/Packages"
 	fi
 
-	./bin/patch-index.pl --index "$odir/Packages" "$@" > "$odir/Packages.$$"
+	./shared/patch-index.pl --index "$odir/Packages" "$@" > "$odir/Packages.$$"
 
 	mv "$odir/Packages.$$" "$odir/Packages"
 }
diff --git a/bin/make-index.pl b/shared/make-index.pl
index a72b4d7..a72b4d7 100755
--- a/bin/make-index.pl
+++ b/shared/make-index.pl
diff --git a/bin/patch-index.pl b/shared/patch-index.pl
index 920bc83..920bc83 100755
--- a/bin/patch-index.pl
+++ b/shared/patch-index.pl
diff --git a/watchcompile.sh b/watchcompile.sh
index 0e8652c..64a8ff9 100755
--- a/watchcompile.sh
+++ b/watchcompile.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-#watch "ps hww -o args | sed -ne 's, BUILD_VARIANT.*,,; s,^make -C package/feeds/,,p' | sort"
+. ./shared/functions.sh
 
-sdkdir="$(readlink -f .cache/sdk/)/"
+sdkdir="$(readlink -f $CACHE_DIR/sdk/)/"
 
 while true; do
 	out="$(
diff --git a/watchresults.sh b/watchresults.sh
index 27ee1b3..e65b3dc 100755
--- a/watchresults.sh
+++ b/watchresults.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 watch -n 5 '
-	. ./bin/functions.sh
+	. ./shared/functions.sh
 
 	for target in $(fetch_remote_targets); do
 		echo -n "$target: "