source needs to be . for sh

updated repo management code

fixed unneeded args in lib.sh

Author: romkey

bin/install-audio-satellite.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-source ./lib.sh
+. ./lib.sh
 
 start_app nginx-proxy-manager
 start_app dnsmasq

bin/install-core.sh

@@ -8,17 +8,26 @@ echo "This script uses `sudo` to run items as root; you'll be prompted at least
 echo "the start to enter your password in order to allow this"
 
 sudo apt update && apt upgrade -y
-sudo apt install pwgen -y
+sudo apt install pwgen curl software-properties-common -y
 
 if ! command -v docker &> /dev/null; then
     echo "Docker not found. Installing Docker..."
 
-    sudo apt install -y apt-transport-https ca-certificates curl software-properties-common
+#    sudo apt install -y apt-transport-https ca-certificates curl software-properties-common
+    sudo apt install -y apt-transport-https ca-certificates curl
+    sudo install -m 0755 -d /etc/apt/keyrings
+    sudo curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc
+    sudo chmod a+r /etc/apt/keyrings/docker.asc
+
+#    sudo add-apt-repository "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian $(lsb_release -cs) stable"
+    sudo echo \
+        "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \
+        $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
+        sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
 
-    curl -fsSL https://download.docker.com/linux/debian/gpg | sudo tee /etc/apt/trusted.gpg.d/docker.asc
-    sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable"
     sudo apt update
-    sudo apt install -y docker-ce docker-ce-cli containerd.io
+#    sudo apt install -y docker-ce docker-ce-cli containerd.io
+    sudo apt install -y docker-ce docker-ce-cli 
 
     sudo systemctl start docker
     sudo systemctl enable docker

bin/install-debian.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-source ./lib.sh
+. ./bin/lib.sh
 
 install_default_config zigbee2mqtt
 start_app zigbee2mqtt

bin/install-zigbee-satellite.sh

@@ -3,19 +3,19 @@
 # source ./lib.sh
 
 start_app() {
-    pushd "$1"
-    if ! docker-compose ps | grep -q 'Up'; then
+    cd "$1"
+    if ! docker compose ps | grep -q 'Up'; then
         echo "Docker Compose project is not running. Starting it..."
-        docker-compose up -d
+        docker compose up -d
         echo "$1 started."
     else
         echo "$1 is already running."
     fi
 
-    popd
+    cd ..
 }
 
-install_default_config(app, filename) {
+install_default_config() {
     if [ -n "$2" ]; then
         cp "$1/config/$2.default" "$1/config/$2"
         echo "Installed $1/config/$2 - you should review this file for possible configuration changes"