Fri Nov 14 11:03:31 AM GMT 2025

Author: gcclinux

packaging/build-snap.sh

@@ -26,8 +26,11 @@ find src/ -name "*.java" > sources.txt
 echo "[run] Compiling Java sources to bin/"
 javac -d bin @sources.txt
 
+echo "[run] Copying resource files (.properties, etc.) to bin/"
+find src -type f \( -name "*.properties" \) -exec sh -c 'mkdir -p "bin/$(dirname "${1#src/}")" && cp "$1" "bin/${1#src/}"' _ {} \;
+
 echo "[run] Now creating SmallTextPad.jar in the current directory"
-jar cfm classes/artifacts/SmallTextPad.jar src/META-INF/MANIFEST.MF -C bin . -C . res -C . dic
+jar cfm classes/artifacts/SmallTextPad.jar src/META-INF/MANIFEST.MF -C bin . -C res . -C dic .
 
 echo "[run] Now creating smalltextpad_<version>_amd64.snap in the current directory"
 snapcraft pack --output=classes/artifacts/smalltextpad_$(grep '^version:' snap/snapcraft.yaml | awk '{print $2}' | tr -d "'")_amd64.snap

snap/snapcraft.yaml

@@ -41,17 +41,27 @@ parts:
     source: .
     build-packages: []
     stage-packages:
-      - openjdk-17-jre
+      - openjdk-21-jre
     build-attributes:
       - no-patchelf
+    override-prime: |
+      craftctl default
+      # Remove problematic external symlinks that snap store doesn't allow
+      rm -f usr/lib/jvm/java-21-openjdk-amd64/lib/security/cacerts || true
     override-build: |
       # Create wrapper script
       mkdir -p $SNAPCRAFT_PART_INSTALL/bin
       cat > $SNAPCRAFT_PART_INSTALL/bin/smalltextpad << 'EOF'
       #!/bin/bash
       export JAVA_HOME=$(find $SNAP/usr/lib/jvm -name "java-*-openjdk-*" -type d | head -1)
       export DISPLAY=${DISPLAY:-:0}
-      exec $JAVA_HOME/bin/java -jar $SNAP/SmallTextPad.jar "$@"
+      
+      # Use SNAP_USER_COMMON as the home directory for Java
+      # This makes the app store its config in ~/snap/smalltextpad/common/.config/
+      mkdir -p "$SNAP_USER_COMMON/.config"
+      
+      cd $SNAP
+      exec $JAVA_HOME/bin/java -Duser.home="$SNAP_USER_COMMON" -jar $SNAP/SmallTextPad.jar "$@"
       EOF
       chmod +x $SNAPCRAFT_PART_INSTALL/bin/smalltextpad
       

sources.txt

@@ -1,20 +1,20 @@
-src/wagemaker/co/uk/lang/LangS.java
-src/wagemaker/co/uk/gui/PageLoader.java
-src/wagemaker/co/uk/gui/About.java
-src/wagemaker/co/uk/gui/DisplayReport.java
-src/wagemaker/co/uk/gui/HistoryViewer.java
-src/wagemaker/co/uk/display/Size.java
-src/wagemaker/co/uk/display/LastPath.java
-src/wagemaker/co/uk/display/Position.java
-src/wagemaker/co/uk/main/Launcher.java
-src/wagemaker/co/uk/utility/ConfigRead.java
-src/wagemaker/co/uk/utility/LaunchBrowser.java
-src/wagemaker/co/uk/utility/FontTheme.java
-src/wagemaker/co/uk/utility/getMyOS.java
-src/wagemaker/co/uk/utility/Details.java
 src/wagemaker/co/uk/utility/SystemOS.java
-src/wagemaker/co/uk/utility/ConfigDir.java
 src/wagemaker/co/uk/utility/PasswordPrompter.java
+src/wagemaker/co/uk/utility/FontTheme.java
 src/wagemaker/co/uk/utility/ConfigFile.java
 src/wagemaker/co/uk/utility/logHistory.java
+src/wagemaker/co/uk/utility/LaunchBrowser.java
+src/wagemaker/co/uk/utility/ConfigDir.java
+src/wagemaker/co/uk/utility/getMyOS.java
 src/wagemaker/co/uk/utility/STPFileCrypter.java
+src/wagemaker/co/uk/utility/ConfigRead.java
+src/wagemaker/co/uk/utility/Details.java
+src/wagemaker/co/uk/main/Launcher.java
+src/wagemaker/co/uk/lang/LangS.java
+src/wagemaker/co/uk/display/Position.java
+src/wagemaker/co/uk/display/Size.java
+src/wagemaker/co/uk/display/LastPath.java
+src/wagemaker/co/uk/gui/About.java
+src/wagemaker/co/uk/gui/PageLoader.java
+src/wagemaker/co/uk/gui/DisplayReport.java
+src/wagemaker/co/uk/gui/HistoryViewer.java