From 74ac6a863d3017beccfa4c3a83a765e7ce698d82 Mon Sep 17 00:00:00 2001
From: Packet Please <pktpls@systemli.org>
Date: Mon, 8 Jul 2024 23:33:25 +0200
Subject: [PATCH] packages: play nice with host OPKG and INSTROOT

(cherry picked from commit 77312c679be7258b249ef48226b6d921f06d3959)
---
 packages/falter-berlin-admin-keys/Makefile               | 4 +++-
 packages/falter-berlin-admin-keys/files/register_keys.sh | 4 ++--
 packages/falter-berlin-autoupdate/files/post-inst.sh     | 3 ++-
 packages/falter-berlin-bbbdigger/Makefile                | 4 +++-
 packages/falter-berlin-bbbdigger/files/postinst.sh       | 2 ++
 packages/falter-berlin-ssid-changer/files/post-inst.sh   | 3 ++-
 6 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/packages/falter-berlin-admin-keys/Makefile b/packages/falter-berlin-admin-keys/Makefile
index e81ea9c4..21335343 100644
--- a/packages/falter-berlin-admin-keys/Makefile
+++ b/packages/falter-berlin-admin-keys/Makefile
@@ -34,7 +34,9 @@ endef
 
 define Package/falter-berlin-admin-keys/postinst
 #!/bin/sh
-$${IPKG_INSTROOT}/tmp/falter-berlin-admin-keys/register_keys.sh
+if [ -z $${IPKG_INSTROOT} ] ; then
+  /tmp/falter-berlin-admin-keys/register_keys.sh
+fi
 endef
 
 $(eval $(call BuildPackage,falter-berlin-admin-keys))
diff --git a/packages/falter-berlin-admin-keys/files/register_keys.sh b/packages/falter-berlin-admin-keys/files/register_keys.sh
index 45044cc4..e0a30a4d 100755
--- a/packages/falter-berlin-admin-keys/files/register_keys.sh
+++ b/packages/falter-berlin-admin-keys/files/register_keys.sh
@@ -7,7 +7,7 @@ KEY_FILES=$(find "$SCRIPTPATH" -name "*.pub")
 
 for KEY_FILE in $KEY_FILES; do
     KEY=$(cat $KEY_FILE)
-    if [ -z "$(grep "$KEY" $IPKG_INSTROOT/etc/dropbear/authorized_keys)" ]; then
-        echo "$KEY" >> $IPKG_INSTROOT/etc/dropbear/authorized_keys
+    if [ -z "$(grep "$KEY" /etc/dropbear/authorized_keys)" ]; then
+        echo "$KEY" >> /etc/dropbear/authorized_keys
     fi
 done
diff --git a/packages/falter-berlin-autoupdate/files/post-inst.sh b/packages/falter-berlin-autoupdate/files/post-inst.sh
index 609e4dbe..f7c892c5 100644
--- a/packages/falter-berlin-autoupdate/files/post-inst.sh
+++ b/packages/falter-berlin-autoupdate/files/post-inst.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
-#
+
+[ -z $IPKG_INSTROOT ] || exit 0
 
 # if autoupdate is not present in crontab, include it.
 crontab -l | grep /usr/bin/autoupdate >>/dev/null
diff --git a/packages/falter-berlin-bbbdigger/Makefile b/packages/falter-berlin-bbbdigger/Makefile
index 9d44026e..ff72ae3a 100644
--- a/packages/falter-berlin-bbbdigger/Makefile
+++ b/packages/falter-berlin-bbbdigger/Makefile
@@ -48,7 +48,9 @@ endef
 
 define Package/falter-berlin-bbbdigger/postinst
 #!/bin/sh
-$${IPKG_INSTROOT}/tmp/falter-berlin-bbbdigger_postinst.sh
+if [ -z $${IPKG_INSTROOT} ] ; then
+  /tmp/falter-berlin-bbbdigger_postinst.sh
+fi
 endef
 
 $(eval $(call BuildPackage,falter-berlin-bbbdigger))
diff --git a/packages/falter-berlin-bbbdigger/files/postinst.sh b/packages/falter-berlin-bbbdigger/files/postinst.sh
index 11528b1d..32062090 100755
--- a/packages/falter-berlin-bbbdigger/files/postinst.sh
+++ b/packages/falter-berlin-bbbdigger/files/postinst.sh
@@ -8,6 +8,8 @@
 #
 # All other config sections are overwritten with current settings
 
+[ -z $IPKG_INSTROOT ] || exit 0
+
 . /lib/functions.sh
 
 TUNNEL_SRV='_bbb-vpn._udp.berlin.freifunk.net'
diff --git a/packages/falter-berlin-ssid-changer/files/post-inst.sh b/packages/falter-berlin-ssid-changer/files/post-inst.sh
index 743a0265..5e91f729 100644
--- a/packages/falter-berlin-ssid-changer/files/post-inst.sh
+++ b/packages/falter-berlin-ssid-changer/files/post-inst.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
-#
+
+[ -z $IPKG_INSTROOT ] || exit 0
 
 # if ssid-changer is not present in crontab, include it.
 crontab -l | grep ssid-changer >>/dev/null