Divide debian and openwrt package metadata files

Signed-off-by: Gerard Hickey <[email protected]>

.github/workflows/workflow-meshchat-debian-package.yaml

@@ -32,7 +32,7 @@ jobs:
       - run: package/update-version.sh ${{ inputs.build_dir }}
       # - run: info "Packing up MeshChat files"
       - run: dpkg-deb --root-owner-group --build ${{ inputs.build_dir }}
-      - run: mv meshchat-deb.deb meshchat_${{ inputs.build_version }}_all.deb
+      - run: mv package/meshchat-deb.deb meshchat_${{ inputs.build_version }}_all.deb
       - id: detect-package-file
         run: echo "file=meshchat_${{inputs.build_version }}_all.deb" >> $GITHUB_OUTPUT
       - run: echo "${{ steps.detect-package-file.outputs.file }}"

package/debian/control

@@ -0,0 +1,10 @@
+Package: meshchat
+Version:
+Depends: lua5.4
+Provides:
+Source: package/meshchat
+Section: net
+Priority: optional
+Maintainer: Gerard Hickey <[email protected]>
+Architecture: all
+Description: P2P distributed chat for mesh networks

package/meshchat/control → package/openwrt/control

@@ -5,6 +5,6 @@ Provides:
 Source: package/meshchat
 Section: net
 Priority: optional
-Maintainer: Tim Wilkinson (KN6PLV) and Trevor Paskett (K7FPV)
+Maintainer: Gerard Hickey <[email protected]>
 Architecture: all
 Description: P2P distributed chat for mesh networks

package/openwrt/postinst

@@ -0,0 +1,38 @@
+#!/bin/sh
+
+grep "|8080|meshchat" /etc/config.mesh/_setup.services.dmz &> /dev/null
+DMZPRESENT=$?
+grep "|8080|meshchat" /etc/config.mesh/_setup.services.nat &> /dev/null
+NATPRESENT=$?
+NODEMODE=$(uci -q -c /etc/local/uci/ get hsmmmesh.settings.config)
+RAND=$(awk 'BEGIN{srand();print int(rand()*10000) }')
+RESTART=0
+
+if [ "$DMZPRESENT" != 0 ]; then
+  echo "MeshChat-$RAND|1|http|$(uname -n)|8080|meshchat" >> /etc/config.mesh/_setup.services.dmz
+  RESTART=1
+fi
+
+if [ "$NATPRESENT" != 0 ]; then
+  echo "MeshChat-$RAND|1|http|$(uname -n)|8080|meshchat" >> /etc/config.mesh/_setup.services.nat
+  RESTART=1
+fi
+
+if [ "$NODEMODE" = "mesh" -a "$RESTART" = "1" ]; then
+  echo "Applying service announcement"
+  /usr/local/bin/node-setup -a -p mesh &> /dev/null
+  /etc/init.d/olsrd restart &> /dev/null
+fi
+
+/etc/init.d/meshchatsync enable
+/etc/init.d/meshchatsync start
+
+echo "<br>"
+
+echo "Mesh Chat has been setup at http://$(uname -n):8080/meshchat"
+echo "<br>"
+if [ "$RESTART" = "1" ]; then
+  echo "An advertised service has been added for Mesh Chat on the Services configuration page"
+fi
+
+exit 0

package/openwrt/preinst

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+/etc/init.d/meshchatsync stop > /dev/null 2> /dev/null
+
+mkdir -p /www/meshchat
+
+# if there is not a meshchat_local.lua, then prepare one
+if [ ! -f /www/cgi-bin/meshchat_local.lua ]; then
+    if [ -f /www/cgi-bin/meshchatconfig.lua ]; then
+        cp /www/cgi-bin/meshchatconfig.lua /www/cgi-bin/meshchat_local.lua
+
+        # remove vars that should not be in meshchat_local.lua
+        sed -i "/^protocol_version/d; /^app_version/d" /www/cgi-bin/meshchat_local.lua
+    else
+        touch /www/cgi-bin/meshchat_local.lua
+    fi
+fi
+
+exit 0

package/openwrt/prerm

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+/etc/init.d/meshchatsync disable
+/etc/init.d/meshchatsync stop
+
+rm -rf /tmp/meshchat
+
+exit 0

package/populate-meshchat-fs.sh

@@ -6,16 +6,15 @@
 IPK_DIR=$1
 OSNAME=$2
 
-# Populate the CONTROL portion of the package
-mkdir -p $IPK_DIR/CONTROL
-cp -p package/meshchat/* $IPK_DIR/CONTROL/
-sed -i "s%\$GITHUB_SERVER_URL%$GITHUB_SERVER_URL%" $IPK_DIR/CONTROL/control
-sed -i "s%\$GITHUB_REPOSITORY%$GITHUB_REPOSITORY%" $IPK_DIR/CONTROL/control
 
 # Populate the filesystem image for the package
 if [[ "$OSNAME" == "debian" ]]; then
-    install -d $IPK_DIR/DEBIAN
-    install -m 644 package/meshchat/* $IPK_DIR/DEBIAN
+    # Populate the CONTROL portion of the package
+    mkdir -p $IPK_DIR/DEBIAN
+    cp -p package/debian/* $IPK_DIR/DEBIAN/
+    sed -i "s%\$GITHUB_SERVER_URL%$GITHUB_SERVER_URL%" $IPK_DIR/DEBIAN/control
+    sed -i "s%\$GITHUB_REPOSITORY%$GITHUB_REPOSITORY%" $IPK_DIR/DEBIAN/control
+
     install -d $IPK_DIR/var/www/html/meshchat
     install www/* $IPK_DIR/var/www/html/meshchat
     install -d $IPK_DIR/usr/lib/cgi-bin
@@ -27,6 +26,12 @@ if [[ "$OSNAME" == "debian" ]]; then
     install -d $IPK_DIR/usr/local/lib/lua/5.4/net
     install -m 644 lib/json.lua $IPK_DIR/usr/local/lib/lua/5.4/net
 elif [[ "$OSNAME" == "openwrt" ]]; then
+    # Populate the CONTROL portion of the package
+    mkdir -p $IPK_DIR/CONTROL
+    cp -p package/openwrt/* $IPK_DIR/CONTROL/
+    sed -i "s%\$GITHUB_SERVER_URL%$GITHUB_SERVER_URL%" $IPK_DIR/CONTROL/control
+    sed -i "s%\$GITHUB_REPOSITORY%$GITHUB_REPOSITORY%" $IPK_DIR/CONTROL/control
+
     install -d $IPK_DIR/www/meshchat
     install www/* $IPK_DIR/www/meshchat
     install -d $IPK_DIR/www/cgi-bin