mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-06-30 03:06:06 +02:00
Compare commits
14 Commits
932e0ad0a5
...
b501f3c2bf
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b501f3c2bf | ||
|
|
2a4a308bea | ||
|
|
46d1df2b59 | ||
|
|
bf427696a8 | ||
|
|
dbaa1d5e33 | ||
|
|
bbbeecd174 | ||
|
|
f9ba24d617 | ||
|
|
39a2656f9c | ||
|
|
afb8e2ef4a | ||
|
|
3d5a6d6d98 | ||
|
|
9a77f6a7e4 | ||
|
|
06ec2f7710 | ||
|
|
4ffb3bc7d4 | ||
|
|
3b7515b7dc |
@@ -65,9 +65,10 @@ test_mount() {
|
||||
fi
|
||||
|
||||
# ---- Final: mounted but not writable ----
|
||||
ERROR_MOUNT=true
|
||||
bashio::log.fatal "Disk mounted, but cannot write. Check permissions/export options and UID/GID mapping."
|
||||
return 1
|
||||
bashio::log.warning "Disk mounted but is read-only or not writable (permission denied). Continuing anyway."
|
||||
MOUNTED=true
|
||||
return 0
|
||||
|
||||
}
|
||||
|
||||
mount_drive() {
|
||||
|
||||
@@ -28,7 +28,7 @@ pick_exec_dir() {
|
||||
if [ -d "$d" ] && [ -w "$d" ]; then
|
||||
# Create a tiny test executable to confirm "exec" works
|
||||
local t="${d%/}/.exec_test_$$"
|
||||
printf '#!/bin/sh\necho ok\n' > "$t" 2>/dev/null || { rm -f "$t" 2>/dev/null || true; continue; }
|
||||
printf '#!/bin/sh\necho ok\n' >"$t" 2>/dev/null || { rm -f "$t" 2>/dev/null || true; continue; }
|
||||
chmod 700 "$t" 2>/dev/null || { rm -f "$t" 2>/dev/null || true; continue; }
|
||||
if "$t" >/dev/null 2>&1; then
|
||||
rm -f "$t" 2>/dev/null || true
|
||||
@@ -63,6 +63,8 @@ candidate_shebangs=(
|
||||
"/bin/sh"
|
||||
)
|
||||
|
||||
SHEBANG_ERRORS=()
|
||||
|
||||
probe_script_content='
|
||||
set -e
|
||||
|
||||
@@ -87,46 +89,46 @@ bashio::addon.version
|
||||
validate_shebang() {
|
||||
local candidate="$1"
|
||||
local tmp out rc
|
||||
local errfile msg
|
||||
|
||||
# shellcheck disable=SC2206
|
||||
local cmd=( $candidate )
|
||||
local exe="${cmd[0]}"
|
||||
|
||||
if [ ! -x "$exe" ]; then
|
||||
echo " - FAIL (not executable): #!$candidate" >&2
|
||||
SHEBANG_ERRORS+=(" - FAIL (not executable): #!$candidate")
|
||||
return 1
|
||||
fi
|
||||
|
||||
tmp="${EXEC_DIR%/}/shebang_test.$$.$RANDOM"
|
||||
errfile="${EXEC_DIR%/}/shebang_probe_err.$$"
|
||||
{
|
||||
printf '#!%s\n' "$candidate"
|
||||
printf '%s\n' "$probe_script_content"
|
||||
} > "$tmp"
|
||||
} >"$tmp"
|
||||
chmod 700 "$tmp" 2>/dev/null || true
|
||||
|
||||
set +e
|
||||
out="$("$tmp" 2>"${EXEC_DIR%/}/shebang_probe_err.$$")"
|
||||
out="$("$tmp" 2>"$errfile")"
|
||||
rc=$?
|
||||
set -e
|
||||
|
||||
rm -f "$tmp" 2>/dev/null || true
|
||||
|
||||
if [ "$rc" -eq 0 ] && [ -n "${out:-}" ] && [ "$out" != "null" ]; then
|
||||
rm -f "${EXEC_DIR%/}/shebang_probe_err.$$" 2>/dev/null || true
|
||||
rm -f "$errfile" 2>/dev/null || true
|
||||
return 0
|
||||
fi
|
||||
|
||||
{
|
||||
echo " - FAIL: #!$candidate"
|
||||
echo " rc=$rc, stdout='${out:-}'"
|
||||
if [ -s "${EXEC_DIR%/}/shebang_probe_err.$$" ]; then
|
||||
echo " stderr:"
|
||||
sed -n '1,8p' "${EXEC_DIR%/}/shebang_probe_err.$$"
|
||||
else
|
||||
echo " stderr: <empty>"
|
||||
fi
|
||||
} >&2
|
||||
rm -f "${EXEC_DIR%/}/shebang_probe_err.$$" 2>/dev/null || true
|
||||
msg=$' - FAIL: #!'"$candidate"$'\n'" rc=$rc, stdout='${out:-}'"$'\n'
|
||||
if [ -s "$errfile" ]; then
|
||||
msg+=$' stderr:\n'
|
||||
msg+="$(sed -n '1,8p' "$errfile")"$'\n'
|
||||
else
|
||||
msg+=$' stderr: <empty>\n'
|
||||
fi
|
||||
SHEBANG_ERRORS+=("$msg")
|
||||
rm -f "$errfile" 2>/dev/null || true
|
||||
return 1
|
||||
}
|
||||
|
||||
@@ -142,11 +144,13 @@ if [ -z "$shebang" ]; then
|
||||
echo "ERROR: No valid shebang found (unable to execute bashio::addon.version via candidates)." >&2
|
||||
echo "Tried:" >&2
|
||||
printf ' - %s\n' "${candidate_shebangs[@]}" >&2
|
||||
if [ "${#SHEBANG_ERRORS[@]}" -gt 0 ]; then
|
||||
echo "Probe failures:" >&2
|
||||
printf '%s\n' "${SHEBANG_ERRORS[@]}" >&2
|
||||
fi
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Selected shebang: #!$shebang"
|
||||
|
||||
####################
|
||||
# Starting scripts #
|
||||
####################
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
|
||||
## 19.3.1-2 (2026-02-04)
|
||||
- Fix startup when cloudcmd.mjs is missing in upstream image
|
||||
|
||||
## 19.3.1 (2026-02-04)
|
||||
- Update to latest version from coderaiser/cloudcmd (changelog : https://github.com/coderaiser/cloudcmd/releases)
|
||||
|
||||
|
||||
@@ -104,4 +104,4 @@ schema:
|
||||
slug: cloudcommander
|
||||
udev: true
|
||||
url: https://github.com/alexbelgium/hassio-addons/tree/master/cloudcommander
|
||||
version: "19.3.1"
|
||||
version: "19.3.1-2"
|
||||
|
||||
@@ -82,7 +82,17 @@ fi
|
||||
bashio::log.info "Starting..."
|
||||
|
||||
cd /
|
||||
./usr/src/app/bin/cloudcmd.mjs '"'"$DROPBOX_TOKEN""$CUSTOMOPTIONS"'"' &
|
||||
if [ -f /usr/src/app/bin/cloudcmd.mjs ]; then
|
||||
CLOUDCMD_BIN=/usr/src/app/bin/cloudcmd.mjs
|
||||
elif [ -f /usr/src/app/bin/cloudcmd.js ]; then
|
||||
CLOUDCMD_BIN=/usr/src/app/bin/cloudcmd.js
|
||||
elif command -v cloudcmd >/dev/null 2>&1; then
|
||||
CLOUDCMD_BIN=cloudcmd
|
||||
else
|
||||
bashio::log.error "Cloud Commander binary not found in /usr/src/app/bin or PATH."
|
||||
exit 1
|
||||
fi
|
||||
"$CLOUDCMD_BIN" '"'"$DROPBOX_TOKEN""$CUSTOMOPTIONS"'"' &
|
||||
bashio::net.wait_for 8000 localhost 900 || true
|
||||
bashio::log.info "Started !"
|
||||
exec nginx
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
## 2.57.0-4 (04-02-2026)
|
||||
- Minor bugs fixed
|
||||
## 2.57.0-3 (04-02-2026)
|
||||
- Minor bugs fixed
|
||||
## 2.57.0-2 (04-02-2026)
|
||||
- Minor bugs fixed
|
||||
|
||||
|
||||
@@ -123,4 +123,4 @@ schema:
|
||||
slug: filebrowser
|
||||
udev: true
|
||||
url: https://github.com/alexbelgium/hassio-addons
|
||||
version: "2.57.0-2"
|
||||
version: "2.57.0-4"
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
## 10.11.6-6 (04-02-2026)
|
||||
- Minor bugs fixed
|
||||
## 10.11.6-5 (03-02-2026)
|
||||
- Minor bugs fixed
|
||||
## 10.11.6-4 (02-02-2026)
|
||||
|
||||
@@ -124,5 +124,5 @@ schema:
|
||||
slug: jellyfin
|
||||
udev: true
|
||||
url: https://github.com/alexbelgium/hassio-addons
|
||||
version: "10.11.6-5"
|
||||
version: "10.11.6-6"
|
||||
video: true
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
## 2.4.2-2 (04-02-2026)
|
||||
- Minor bugs fixed
|
||||
|
||||
## 2.4.2 (2026-02-04)
|
||||
- Update to latest version from TandoorRecipes/recipes (changelog : https://github.com/TandoorRecipes/recipes/releases)
|
||||
|
||||
@@ -112,5 +112,5 @@ services:
|
||||
slug: tandoor_recipes
|
||||
udev: true
|
||||
url: https://github.com/alexbelgium/hassio-addons
|
||||
version: "2.4.2"
|
||||
version: "2.4.2-2"
|
||||
webui: http://[HOST]:[PORT:80]
|
||||
|
||||
Reference in New Issue
Block a user