Crafty Controller: Wait for credentials file instead of fixed sleep

ct/romm.sh

@@ -54,12 +54,8 @@ function update_script() {
     # Merge static assets into dist folder
     cp -rf /opt/romm/frontend/assets/* /opt/romm/frontend/dist/assets/
     mkdir -p /opt/romm/frontend/dist/assets/romm
-    ROMM_BASE=$(grep '^ROMM_BASE_PATH=' /opt/romm/.env | cut -d'=' -f2)
-    ROMM_BASE=${ROMM_BASE:-/var/lib/romm}
-    ln -sfn "$ROMM_BASE"/resources /opt/romm/frontend/dist/assets/romm/resources
-    ln -sfn "$ROMM_BASE"/assets /opt/romm/frontend/dist/assets/romm/assets
-    sed -i "s|alias .*/library/;|alias ${ROMM_BASE}/library/;|" /etc/nginx/sites-available/romm
-    systemctl reload nginx
+    ln -sfn /var/lib/romm/resources /opt/romm/frontend/dist/assets/romm/resources
+    ln -sfn /var/lib/romm/assets /opt/romm/frontend/dist/assets/romm/assets
     msg_ok "Updated ROMM"
 
     msg_info "Starting Services"

install/crafty-controller-install.sh

@@ -67,12 +67,18 @@ Restart=on-failure
 WantedBy=multi-user.target
 EOF
 $STD systemctl enable -q --now crafty-controller
-sleep 10
-{
-  echo "Crafty-Controller-Credentials"
-  echo "Username: $(grep -oP '(?<="username": ")[^"]*' /opt/crafty-controller/crafty/crafty-4/app/config/default-creds.txt)"
-  echo "Password: $(grep -oP '(?<="password": ")[^"]*' /opt/crafty-controller/crafty/crafty-4/app/config/default-creds.txt)"
-} >>~/crafty-controller.creds
+CREDS_FILE="/opt/crafty-controller/crafty/crafty-4/app/config/default-creds.txt"
+for i in $(seq 1 30); do
+  [[ -f "$CREDS_FILE" ]] && break
+  sleep 2
+done
+if [[ -f "$CREDS_FILE" ]]; then
+  {
+    echo "Crafty-Controller-Credentials"
+    echo "Username: $(grep -oP '(?<="username": ")[^"]*' "$CREDS_FILE")"
+    echo "Password: $(grep -oP '(?<="password": ")[^"]*' "$CREDS_FILE")"
+  } >>~/crafty-controller.creds
+fi
 msg_ok "Service started"
 
 motd_ssh

install/romm-install.sh

@@ -176,10 +176,8 @@ $STD npm run build
 cp -rf /opt/romm/frontend/assets/* /opt/romm/frontend/dist/assets/
 
 mkdir -p /opt/romm/frontend/dist/assets/romm
-ROMM_BASE=$(grep '^ROMM_BASE_PATH=' /opt/romm/.env | cut -d'=' -f2)
-ROMM_BASE=${ROMM_BASE:-/var/lib/romm}
-ln -sfn "$ROMM_BASE"/resources /opt/romm/frontend/dist/assets/romm/resources
-ln -sfn "$ROMM_BASE"/assets /opt/romm/frontend/dist/assets/romm/assets
+ln -sfn /var/lib/romm/resources /opt/romm/frontend/dist/assets/romm/resources
+ln -sfn /var/lib/romm/assets /opt/romm/frontend/dist/assets/romm/assets
 msg_ok "Set up RomM Frontend"
 
 msg_info "Configuring Nginx"
@@ -253,7 +251,6 @@ server {
 }
 EOF
 
-sed -i "s|alias /var/lib/romm/library/;|alias ${ROMM_BASE}/library/;|" /etc/nginx/sites-available/romm
 rm -f /etc/nginx/sites-enabled/default
 ln -sf /etc/nginx/sites-available/romm /etc/nginx/sites-enabled/romm
 systemctl restart nginx