Merge pull request #12 from remcoros/fix/setConfig_dependencies

Fix/set config dependencies

.github/workflows/buildService.yml

@@ -28,9 +28,9 @@ jobs:
           PACKAGE_ID=$(yq -oy ".id" manifest.*)
           echo "package_id=$PACKAGE_ID" >> $GITHUB_ENV
         shell: bash
-
-      - name: Upload .s9pk
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ env.package_id }}.s9pk
-          path: ./${{ env.package_id }}.s9pk
+#
+#      - name: Upload .s9pk
+#        uses: actions/upload-artifact@v3
+#        with:
+#          name: ${{ env.package_id }}.s9pk
+#          path: ./${{ env.package_id }}.s9pk

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:debianbookworm-d42b46dd-ls51 AS buildstage
+FROM ghcr.io/linuxserver/baseimage-kasmvnc:debianbookworm-d274027d-ls53 AS buildstage
 
 # these are specified in Makefile
 ARG ARCH

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-debianbookworm-d42b46dd-ls51 AS buildstage
+FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-debianbookworm-d274027d-ls53 AS buildstage
 
 # these are specified in Makefile
 ARG ARCH

docker_entrypoint.sh

@@ -36,6 +36,11 @@ if [ ! -f /config/.sparrow/config ]; then
   chown -R $PUID:$PGID /config/.sparrow
 fi
 
+# always overwrite autostart in case we change it
+mkdir -p /config/.config/openbox
+cp /defaults/autostart /config/.config/openbox/autostart
+chown -R abc:abc /config/.config/openbox
+
 # Manage Sparrow settings?
 if [ $(yq e '.sparrow.managesettings' /root/data/start9/config.yaml) = "true" ]; then
   # private bitcoin/electrum server

manifest.yaml

@@ -1,6 +1,6 @@
 id: sparrow-webtop
 title: "Sparrow"
-version: 1.8.5.1
+version: 1.8.5.2
 release-notes: |
   * Update to Sparrow 1.8.5 - See [full changelog](https://github.com/sparrowwallet/sparrow/releases/tag/1.8.5)
   * Update and pin docker base image to specific debian version

scripts/procedures/migrations.ts

@@ -1,4 +1,4 @@
 import { compat, types as T } from "../deps.ts";
 
 export const migration: T.ExpectedExports.migration = compat.migrations
-    .fromMapping({}, "1.8.5.1" );
+    .fromMapping({}, "1.8.5.2" );

scripts/procedures/setConfig.ts

@@ -2,8 +2,10 @@ import { compat, types as T } from "../deps.ts";
 
 // Define a custom type for T.Config to include the 'server' property with a 'type' property
 interface SparrowConfig extends T.Config {
-  server?: {
-    type?: string;
+  sparrow?: {
+    server?: {
+      type?: string;
+    };
   };
 }
 
@@ -12,8 +14,8 @@ export const setConfig: T.ExpectedExports.setConfig = async (
   effects: T.Effects,
   newConfig: SparrowConfig,
 ) => {
-  const depsBitcoind: { [key: string]: string[] } = newConfig?.server?.type === "bitcoind" ? { "bitcoind": [] } : {};
-  const depsElectrs: { [key: string]: string[] } = newConfig?.server?.type === "electrs" ? { "electrs": [] } : {};
+  const depsBitcoind: { [key: string]: string[] } = newConfig?.sparrow?.server?.type === "bitcoind" ? { "bitcoind": [] } : {};
+  const depsElectrs: { [key: string]: string[] } = newConfig?.sparrow?.server?.type === "electrs" ? { "electrs": [] } : {};
 
   return compat.setConfig(effects, newConfig, {
     ...depsBitcoind,