rollback to unionfs

Author: zerobikappa

.github/workflows/build.yml

@@ -46,7 +46,7 @@ jobs:
           mv SourceHanSans.ttc appimage-myapp-appdir-template/opt/myapp/myapp_fonts/sourrcehansans.ttc
           ./appimage-myapp-appdir-template/.remove-appdir-git.sh
 
-          cp "$(command -v fuse-overlayfs)" appimage-myapp-appdir-template/usr/bin/
+          cp "$(command -v unionfs)" appimage-myapp-appdir-template/usr/bin/
           ARCH=x86_64 ./appimagetool.AppImage appimage-myapp-appdir-template
 
           #ARCH=aarch64 ./appimagetool.AppImage appimage-myapp-appdir-template

.github/workflows/test.yml

@@ -46,7 +46,7 @@ jobs:
           mv SourceHanSans.ttc appimage-myapp-appdir-template/opt/myapp/myapp_fonts/sourrcehansans.ttc
           ./appimage-myapp-appdir-template/.remove-appdir-git.sh
 
-          cp "$(command -v fuse-overlayfs)" appimage-myapp-appdir-template/usr/bin/
+          cp "$(command -v unionfs)" appimage-myapp-appdir-template/usr/bin/
           ARCH=x86_64 ./appimagetool.AppImage appimage-myapp-appdir-template
 
           #ARCH=aarch64 ./appimagetool.AppImage appimage-myapp-appdir-template

opt/myapp/myapp_script/main.sh

@@ -71,10 +71,7 @@ prevent_root
 
 debug_set
 
-# TODO: cannot use new unionfs because same commandline options was changed.
-# WALKAROUND: ship old version unionfs in appimage package.
-#UNIONFS_BIN="${APPDIR}/usr/bin/unionfs"
-UNIONFS_BIN="${APPDIR}/usr/bin/fuse-overlayfs"
+mpPlugin_fusetool_setBin
 debug_print_env UNIONFS_BIN >&3 2>&4
 
 

opt/myapp/myapp_script/myapp-plugin-fusetool.sh

@@ -1 +1 @@
-myapp-plugin-overlayfs-fuse.sh
+myapp-plugin-unionfs-fuse.sh

opt/myapp/myapp_script/myapp-plugin-overlayfs-fuse.sh

@@ -15,6 +15,17 @@ fi
 source ./myapp-debug.sh 2>/dev/null
 ##############################################
 
+#############################################
+## Set fuse bin.
+# Export env:
+#   $UNIONFS_BIN
+function mpPlugin_fusetool_setBin(){
+    # TODO: cannot use new unionfs because same commandline options was changed.
+    # WALKAROUND: ship old version unionfs in appimage package.
+    UNIONFS_BIN="${APPDIR}/usr/bin/fuse-overlayfs"
+}
+#############################################
+
 
 #############################################
 ## Prepare fuse mount point env variables.

opt/myapp/myapp_script/myapp-plugin-unionfs-fuse.sh

@@ -15,6 +15,17 @@ fi
 source ./myapp-debug.sh 2>/dev/null
 ##############################################
 
+#############################################
+## Set fuse bin.
+# Export env:
+#   $UNIONFS_BIN
+function mpPlugin_fusetool_setBin(){
+    # TODO: cannot use new unionfs because same commandline options was changed.
+    # WALKAROUND: ship old version unionfs in appimage package.
+    UNIONFS_BIN="${APPDIR}/usr/bin/unionfs"
+}
+#############################################
+
 
 #############################################
 ## Prepare fuse mount point env variables.