refactor to use any unknown prefixHEADmain

3 files changed, 8 insertions, 8 deletions

diff --git a/bin/inet2.sh b/bin/inet2.sh
index cb98c6c..00f1168 100755
--- a/bin/inet2.sh
+++ b/bin/inet2.sh
@@ -1,6 +1,6 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
-. /var/lib/inet2/inet2.sh
+. ${INET2_PREFIX}/share/inet2/inet2.sh
 
 runscripts() {
   if [ -n "$(getval "interface $2" "$1")" ]; then
@@ -26,7 +26,7 @@ start() {
   rm -fr /run/inet2/wg 2> /dev/null
   mkdir -p /run/inet2/wg
 
-  /usr/local/bin/mkbirdconfig.sh
+  ${INET2_PREFIX}/bin/mkbirdconfig.sh
 
   step "Setting loopback addresses"
   getval Loopback | while read -r addr; do
@@ -35,7 +35,7 @@ start() {
   
   getval interface | while read -r inter; do
     step "Generating config for $inter"
-    run /usr/local/bin/mkwgconfig.sh "$inter" /run/inet2/wg/"$inter"
+    run ${INET2_PREFIX}/bin/mkwgconfig.sh "$inter" /run/inet2/wg/"$inter"
     
     # create the wireguard interface *in the default namespace*
     step "Adding Wireguard interface $inter"
@@ -90,7 +90,7 @@ stop() {
 reload() {
   getval interface | while read -r inter; do
     step "Generating config for $inter"
-    run /usr/local/bin/mkwgconfig.sh "$inter" /run/inet2/wg/"$inter" /etc/inet2.conf
+    run ${INET2_PREFIX}/bin/mkwgconfig.sh "$inter" /run/inet2/wg/"$inter" /etc/inet2.conf
     
     step "Setting Wireguard config for $inter"
     run wg setconf "$inter" /run/inet2/wg/"$inter"
diff --git a/bin/mkbirdconfig.sh b/bin/mkbirdconfig.sh
index bf5c1f3..a7ca42e 100755
--- a/bin/mkbirdconfig.sh
+++ b/bin/mkbirdconfig.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. /var/lib/inet2/inet2.sh
+. ${INET2_PREFIX}/share/inet2/inet2.sh
 
 escapebird() {
     sed -e 's/\\/\\\\/g;s/"/\\"/g'
diff --git a/bin/mkwgconfig.sh b/bin/mkwgconfig.sh
index 6ee11a9..2da87be 100755
--- a/bin/mkwgconfig.sh
+++ b/bin/mkwgconfig.sh
@@ -1,11 +1,11 @@
-#!/usr/bin/env sh
+#!/bin/sh
 # args: /path/to/interface-config /path/to/output.conf
 
 inter="$1"
 configfile=/etc/inet2.conf
 
 getval() {
-  /var/lib/inet2/config.awk "$configfile" "$@"
+  ${INET2_PREFIX}/share/inet2/config.awk "$configfile" "$@"
 }
 
 k() {