From 3696b65c7da2708ff56102f90683b3d302f0a17d Mon Sep 17 00:00:00 2001
From: CanbiZ <47820557+MickLesk@users.noreply.github.com>
Date: Tue, 29 Jul 2025 10:49:50 +0200
Subject: [PATCH] fixes

---
 frontend/public/json/jeedom.json | 89 +++++++++++++++-----------------
 install/jeedom-install.sh        | 22 ++++----
 2 files changed, 54 insertions(+), 57 deletions(-)

diff --git a/frontend/public/json/jeedom.json b/frontend/public/json/jeedom.json
index 35fe87b0..60641af8 100644
--- a/frontend/public/json/jeedom.json
+++ b/frontend/public/json/jeedom.json
@@ -1,51 +1,44 @@
 {
-    "name": "Jeedom",
-    "slug": "jeedom",
-    "categories": [
-        16
-    ],
-    "date_created": "2025-03-06",
-    "type": "ct",
-    "updateable": false,
-    "privileged": false,
-    "interface_port": 80,
-    "documentation": "https://doc.jeedom.com",
-    "config_path": "",
-    "website": "https://jeedom.com/",
-    "logo": "https://jeedom.com/_next/image?url=%2Fassets%2Fimg%2Flogo.png&w=256&q=75",
-    "description": "From individual homes to IoT infrastructures\n\nJeedom: the tailor-made open source solution",
-    "install_methods": [
-        {
-            "type": "default",
-            "script": "ct/jeedom.sh",
-            "resources": {
-                "cpu": 2,
-                "ram": 2048,
-                "hdd": 16,
-                "os": "Debian",
-                "version": "11"
-            }
-        },
-        {
-            "type": "default",
-            "script": "ct/jeedom.sh",
-            "resources": {
-                "cpu": 2,
-                "ram": 2048,
-                "hdd": 16,
-                "os": "Debian",
-                "version": "12"
-            }
-        }
-    ],
-    "default_credentials": {
-        "username": "admin",
-        "password": "admin"
+  "name": "Jeedom",
+  "slug": "jeedom",
+  "categories": [
+    16
+  ],
+  "date_created": "2025-03-06",
+  "type": "ct",
+  "updateable": false,
+  "privileged": false,
+  "interface_port": 80,
+  "documentation": "https://doc.jeedom.com",
+  "config_path": "",
+  "website": "https://jeedom.com/",
+  "logo": "https://jeedom.com/_next/image?url=%2Fassets%2Fimg%2Flogo.png&w=256&q=75",
+  "description": "Jeedom is a home automation system that is free, open, and cloudless. It allows users to manage and automate various aspects of their homes by creating objects, installing plugins for added functionalities, and connecting to a Market account for services. It also supports direct access URLs and user management.",
+  "install_methods": [
+    {
+      "type": "default",
+      "script": "ct/jeedom.sh",
+      "resources": {
+        "cpu": 2,
+        "ram": 2048,
+        "hdd": 16,
+        "os": "Debian",
+        "version": "12"
+      }
+    }
+  ],
+  "default_credentials": {
+    "username": "admin",
+    "password": "admin"
+  },
+  "notes": [
+    {
+      "text": "WARNING: Installation sources scripts outside of Community Scripts repo. Please check the source before installing.",
+      "type": "warning"
     },
-    "notes": [
-        {
-            "text": "Only OS packages are updateable. To update Jeedom, please use the web interface.",
-            "type": "info"
-        }
-    ]
+    {
+      "text": "Only OS packages are updateable. To update Jeedom, please use the web interface.",
+      "type": "info"
+    }
+  ]
 }
diff --git a/install/jeedom-install.sh b/install/jeedom-install.sh
index c9a736ab..d868e84b 100644
--- a/install/jeedom-install.sh
+++ b/install/jeedom-install.sh
@@ -15,24 +15,27 @@ update_os
 
 msg_info "Installing dependencies"
 $STD apt-get install -y \
-    lsb-release \
-    git
+  lsb-release \
+  git
 msg_ok "Dependencies installed"
 
 DEFAULT_BRANCH="master"
+REPO_URL="https://github.com/jeedom/core.git"
+
 echo
 while true; do
-    read -r -p "Enter branch to use (master, beta, alpha...) (Default: ${DEFAULT_BRANCH}): " BRANCH
-    BRANCH=${BRANCH:-$DEFAULT_BRANCH}
+  read -rp "${TAB3}Enter branch to use (master, beta, alpha...) (Default: ${DEFAULT_BRANCH}): " BRANCH
+  BRANCH="${BRANCH:-$DEFAULT_BRANCH}"
 
-    if git ls-remote --heads https://github.com/jeedom/core.git "$BRANCH" | grep -q "$BRANCH"; then
-        break
-    else
-        echo "Branch '$BRANCH' does not exist. Please enter a valid branch."
-    fi
+  if git ls-remote --heads "$REPO_URL" "refs/heads/$BRANCH" | grep -q .; then
+    break
+  else
+    msg_error "Branch '$BRANCH' does not exist on remote. Please try again."
+  fi
 done
 
 msg_info "Downloading Jeedom installation script"
+cd /tmp
 wget -q https://raw.githubusercontent.com/jeedom/core/"${BRANCH}"/install/install.sh
 chmod +x install.sh
 msg_ok "Installation script downloaded"
@@ -85,6 +88,7 @@ motd_ssh
 customize
 
 msg_info "Cleaning up"
+rm -rf /tmp/install.sh
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
 msg_ok "Cleaned"