Compare commits

..

1 Commits

Author SHA1 Message Date
MickLesk ca5b527739 fireshare: source fireshare.env during update instead of hardcoding defaults 2026-08-24 08:02:03 +02:00
3 changed files with 5 additions and 21 deletions
+3 -5
View File
@@ -57,11 +57,9 @@ function update_script() {
$STD .venv/bin/python -m pip install --upgrade --break-system-packages pip $STD .venv/bin/python -m pip install --upgrade --break-system-packages pip
$STD .venv/bin/python -m pip install --no-cache-dir --break-system-packages --ignore-installed app/server $STD .venv/bin/python -m pip install --no-cache-dir --break-system-packages --ignore-installed app/server
cp .venv/bin/fireshare /usr/local/bin/fireshare cp .venv/bin/fireshare /usr/local/bin/fireshare
export FLASK_APP="/opt/fireshare/app/server/fireshare:create_app()" set -a
export DATA_DIRECTORY=/opt/fireshare-data source /opt/fireshare/fireshare.env
export IMAGE_DIRECTORY=/opt/fireshare-images set +a
export VIDEO_DIRECTORY=/opt/fireshare-videos
export PROCESSED_DIRECTORY=/opt/fireshare-processed
$STD uv run flask db upgrade $STD uv run flask db upgrade
cd /opt/fireshare/app/client cd /opt/fireshare/app/client
$STD npm install $STD npm install
+1 -8
View File
@@ -62,14 +62,7 @@ repo_state_list() {
component_exists_in_sources() { component_exists_in_sources() {
local component="$1" local component="$1"
local line comp grep -h -E "^[^#]*Components:[^#]*\b${component}\b" /etc/apt/sources.list.d/*.sources 2>/dev/null | grep -q .
while IFS= read -r line; do
line="${line#*Components:}"
for comp in $line; do
[[ "$comp" == "$component" ]] && return 0
done
done < <(grep -h -E "^[^#]*Components:" /etc/apt/sources.list.d/*.sources 2>/dev/null)
return 1
} }
require_whiptail() { require_whiptail() {
+1 -8
View File
@@ -63,14 +63,7 @@ get_pve_major_minor() {
component_exists_in_sources() { component_exists_in_sources() {
local component="$1" local component="$1"
local line comp grep -h -E "^[^#]*Components:[^#]*\b${component}\b" /etc/apt/sources.list.d/*.sources 2>/dev/null | grep -q .
while IFS= read -r line; do
line="${line#*Components:}"
for comp in $line; do
[[ "$comp" == "$component" ]] && return 0
done
done < <(grep -h -E "^[^#]*Components:" /etc/apt/sources.list.d/*.sources 2>/dev/null)
return 1
} }
main() { main() {