Update to match os2borgerpc-kiosk-image v3.0.0

Author: agnetemoos

scripts/DEPENDENCIES

@@ -6,3 +6,4 @@ python3-yaml
 curl
 pwgen
 ntpdate
+jq

scripts/install_dependencies.sh

@@ -74,9 +74,6 @@ if [ "$PKGS_TO_INSTALL" != "" ]; then
     fi
 fi
 
-# Install os2borgerpc client
-pip3 install os2borgerpc-client
-
 # Install Danish language package
 apt-get -y install language-pack-da language-pack-da-base
 
@@ -94,4 +91,4 @@ dpkg-reconfigure --frontend=noninteractive tzdata
 update-locale LANG=da_DK.utf-8
 
 # Update the time accordingly
-ntpdate pool.ntp.org
+ntpdate pool.ntp.org

scripts/os2borgerpc_kiosk_setup

@@ -28,11 +28,27 @@ mkdir -p /etc/os2borgerpc/security/
 
 # Set product in configuration
 PRODUCT="os2borgerpc kiosk"
-set_os2borgerpc_config os2_product "$PRODUCT"
+echo "os2_product: $PRODUCT" >> /etc/os2borgerpc/os2borgerpc.conf
 
 # Set version in configuration
 VERSION=$(cat "$DIR"/VERSION)
-set_os2borgerpc_config os2borgerpc_version "$VERSION"
+echo "os2borgerpc_version: $VERSION" >> /etc/os2borgerpc/os2borgerpc.conf
+
+# Insert values from config.cfg that are prefixed with 'DEFAULT_' into os2borgerpc.conf.
+# Path to the configuration file
+CONFIG_FILE="$DIR/config.cfg"
+
+# Read each line in the configuration file and reformat it
+while IFS='=' read -r key value; do
+    # Skip empty lines, lines without '=', and lines starting with '#'
+    if [[ -n "$key" && -n "$value" && "$key" != \#* ]]; then
+        # Convert key to lowercase and remove "DEFAULT_" prefix
+        lowercase_key=$(echo "$key" | sed 's/^DEFAULT_//' | tr '[:upper:]' '[:lower:]')
+        
+        # Write in "key: value" format
+        echo "${lowercase_key}: ${value}" >> /etc/os2borgerpc/os2borgerpc.conf
+    fi
+done < "$CONFIG_FILE"
 
 # Setup Chromium user
 USER="chrome"
@@ -90,4 +106,4 @@ Dpkg::Lock {Timeout "300";};
 EOF
 
 #  Connect to the admin system
-register_new_os2borgerpc_client.sh
+install_client_and_register.sh