Merge pull request #5 from bailuk/stage

Merge flatpak additions

Author: bailuk

README.md

@@ -4,6 +4,10 @@
 Weather forecast application based on [mapsforge-gtk](https://github.com/bailuk/mapsforge-gtk) and [java-gtk](https://github.com/bailuk/java-gtk).
 Forecast data is from [Meteorologisk institutt Norge](https://www.met.no).
 
+<a href='https://flathub.org/apps/ch.bailu.gtk_meteo'>
+    <img width='240' alt='Get it on Flathub' src='https://flathub.org/api/badge?locale=nb-NO'/>
+</a>
+
 ## Features
 - Select place from map or text search
 - 5 days forecast

flatpak/ch.bailu.gtk_meteo.json

@@ -7,6 +7,17 @@
     "org.freedesktop.Sdk.Extension.openjdk17"
   ],
   "command": "gtk-meteo.sh",
+  "finish-args": [
+    "--share=network",
+    "--share=ipc",
+    "--socket=wayland",
+    "--socket=fallback-x11",
+    "--device=dri",
+    "--env=GIO_EXTRA_MODULES=/app/lib/gio/modules",
+    "--env=JAVA_HOME=/app/jre",
+    "--env=LIBO_FLATPAK=1",
+    "--env=PATH=/app/jre/bin:/app/bin:/usr/bin"
+  ],
   "modules": [
     {
       "name": "openjdk",
@@ -22,7 +33,7 @@
         {
           "type": "git",
           "url": "https://github.com/bailuk/gtk-meteo.git",
-          "branch": "543eb0a5ff40b57d70277fb6c7ac9b3e6f9fb431"
+          "commit": "7e7d91690fea4389be3162cde723003c367219ef"
         },
         "gradle-sources.json"
       ],
@@ -36,18 +47,5 @@
         "install -Dm644 src/main/resources/svg/app-icon.svg /app/share/icons/hicolor/scalable/apps/ch.bailu.gtk_meteo.svg"
       ]
     }
-  ],
-  "finish-args": [
-    "--share=network",
-    "--share=ipc",
-    "--socket=wayland",
-    "--socket=fallback-x11",
-    "--device=dri",
-    "--env=GIO_EXTRA_MODULES=/app/lib/gio/modules",
-    "--env=JAVA_HOME=/app/jre",
-    "--env=LIBO_FLATPAK=1",
-    "--env=PATH=/app/bin:/app/jre/bin",
-    "--filesystem=~/.config/gtk-meteo",
-    "--filesystem=~/.java/.userPrefs/gtk-meteo"
   ]
 }

flatpak/flatpak-create-lint.sh

@@ -5,9 +5,6 @@ full_id="ch.bailu.$short_id"
 
 # As described in https://docs.flathub.org/docs/for-app-authors/submission/
 
-test -d flatpak || cd ..
-cd flatpak || exit 1
-
 flatpak_base="build/flatpak"
 flatpak_export="${flatpak_base}/export"
 flatpak_repo="${flatpak_base}/repo"
@@ -65,7 +62,6 @@ echo "_"
 echo "Export flatpak"
 flatpak build-export ${flatpak_export} ${flatpak_build} || exit 1
 
-
 echo "_"
 echo "Build single-file bundle"
 flatpak build-bundle ${flatpak_export} ${flatpak_base}/${short_id}.flatpak "$full_id"

flatpak/flatpak-generate-gradle-sources.sh

@@ -41,8 +41,8 @@ gradle_target="build"
 # The maven repos:
 REPO_BASEURL=(
   'https://plugins.gradle.org/m2/'
-	'https://repo1.maven.org/maven2/'
-	'https://jitpack.io/'
+  'https://repo1.maven.org/maven2/'
+  'https://jitpack.io/'
 )
 
 gradle_user_home="${module_root}/flatpak/build/gradle"
@@ -87,19 +87,19 @@ cd "$gradle_user_home/caches/modules-2/files-2.1" || exit 1
 # Transforms gradle cache paths to maven repo paths
 function mavenize {
   IFS='/' read -r -a paths <<< "$1"
-	groupId=$(echo "${paths[1]}" | tr . /)
-	artifactId="${paths[2]}"
-	version="${paths[3]}"
-	echo "$groupId/$artifactId/$version"
+  groupId=$(echo "${paths[1]}" | tr . /)
+  artifactId="${paths[2]}"
+  version="${paths[3]}"
+  echo "$groupId/$artifactId/$version"
 }
 
 echo "_"
 echo "Copy every file from the cache to it's maven repo location"
 find . -type f -print0 | while IFS= read -r -d '' file; do
-	filename=$(basename "$file")
-	source_dir=$(dirname "$file")
-	target_dir="$maven_repo/$(mavenize "$file")"
-	mkdir -p "$target_dir" && cp "$source_dir/$filename" "$target_dir/"
+  filename=$(basename "$file")
+  source_dir=$(dirname "$file")
+  target_dir="$maven_repo/$(mavenize "$file")"
+  mkdir -p "$target_dir" && cp "$source_dir/$filename" "$target_dir/"
 done
 
 echo "_"
@@ -112,33 +112,33 @@ echo '[' > "$source_file"
 echo "_"
 echo "Probe repository for each file and write source object to json"
 find * -type f | sort | while IFS= read -r file; do
-	url=''
-	for repo in "${REPO_BASEURL[@]}"; do
-		url_to_try="${repo}${file}"
-		if curl --head "$url_to_try" --fail -L &> /dev/null; then
-			url="$url_to_try"
-			break
-		fi
-	done
-	if [ -z "$url" ]; then
-		echo "ERROR: No repo contains $file"
-		exit 1
-	fi
-	hash="$(sha256sum "$file" | cut -f 1 -d ' ')"
-
-	echo "_"
+  url=''
+  for repo in "${REPO_BASEURL[@]}"; do
+    url_to_try="${repo}${file}"
+    if curl --head "$url_to_try" --fail -L &> /dev/null; then
+      url="$url_to_try"
+      break
+    fi
+  done
+  if [ -z "$url" ]; then
+    echo "ERROR: No repo contains $file"
+    exit 1
+  fi
+  hash="$(sha256sum "$file" | cut -f 1 -d ' ')"
+
+  echo "_"
   echo "$url"
   echo "$hash"
   echo "$file"
 
-	cat << HERE >> "$source_file"
-	{
-		"type": "file",
-		"url": "$url",
-		"sha256": "$hash",
-		"dest": "maven-local/$(dirname "$file")",
-		"dest-filename": "$(basename "$file")"
-	},
+  cat << HERE >> "$source_file"
+  {
+    "type": "file",
+    "url": "$url",
+    "sha256": "$hash",
+    "dest": "maven-local/$(dirname "$file")",
+    "dest-filename": "$(basename "$file")"
+  },
 HERE
 done
 
@@ -158,7 +158,7 @@ HERE
 
 # Remove last line in json file and replace with closing braces without comma
 head -n -1 "$source_file" > temp.json && mv temp.json "$source_file"
-echo '	}' >> "$source_file"
+echo '  }' >> "$source_file"
 # And close the json array
 echo ']' >> "$source_file"
 

flatpak/flatpak-pin-commit.sh

@@ -5,4 +5,4 @@ git_hash=$(git show --format="%H" --no-patch)
 
 echo "_"
 echo "update '${out_file}' (commit: $git_hash)"
-sed -i 's/"branch": .*"/"branch": '\"${git_hash}\"'/g' "${out_file}"
+sed -i 's/"commit": .*"/"commit": '\"${git_hash}\"'/g' "${out_file}"

src/main/kotlin/config/Files.kt

@@ -4,10 +4,13 @@ import config.Strings.userAgent
 import java.io.File
 
 object Files {
-    val configDirectory =
-        File(System.getProperty("user.home") + "/.config/$userAgent/")
+
+    private val configHome = (System.getenv("XDG_CONFIG_HOME")
+        ?: (System.getProperty("user.home") + "/.config")) + "/$userAgent"
+    val configDirectory = File(configHome)
 
     init {
+        println("CONFIG_HOME: $configHome")
         configDirectory.mkdirs()
     }
 

src/main/kotlin/controller/Prefs.kt

@@ -1,11 +1,16 @@
 package controller
 
+import config.Files
 import config.Keys
 import java.util.prefs.Preferences
 
 object Prefs {
-    private val prefs = Preferences.userRoot().node("gtk-meteo")
+    private val prefs: Preferences
 
+    init {
+        System.setProperty("java.util.prefs.userRoot", Files.configDirectory.path)
+        prefs = Preferences.userRoot().node("gtk-meteo")
+    }
     fun putAutoCycle(value: Boolean) {
         prefs.putBoolean(Keys.AUTO_CYCLE, value)
     }