jeka/kiauh
1
0
Fork 0
mirror of https://github.com/dw-0/kiauh.git synced 2025-12-16 03:54:27 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix: make use of the delivered .version files to read mainsail and fluidd version

Browse Source
This commit is contained in:
th33xitus
2021-01-21 11:28:31 +01:00
parent d098eef08e
commit 738269adae
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/status.sh
View File

@@ -400,10 +400,9 @@ compare_moonraker_versions(){
read_local_mainsail_version(){ read_local_mainsail_version(){
unset MAINSAIL_VER_FOUND unset MAINSAIL_VER_FOUND
MAINSAIL_APP_FILE=$(find $MAINSAIL_DIR/js -name "app.*.js" 2>/dev/null) if [ -e $MAINSAIL_DIR/.version ]; then
if [ ! -z $MAINSAIL_APP_FILE ]; then
MAINSAIL_LOCAL_VER=$(grep -o -E 'state:{packageVersion:.+' $MAINSAIL_APP_FILE | cut -d'"' -f2)
MAINSAIL_VER_FOUND="true" MAINSAIL_VER_FOUND="true"
MAINSAIL_LOCAL_VER=$(head -n 1 $MAINSAIL_DIR/.version)
else else
MAINSAIL_VER_FOUND="false" && unset MAINSAIL_LOCAL_VER MAINSAIL_VER_FOUND="false" && unset MAINSAIL_LOCAL_VER
fi fi
@@ -440,10 +439,9 @@ compare_mainsail_versions(){
read_local_fluidd_version(){ read_local_fluidd_version(){
unset FLUIDD_VER_FOUND unset FLUIDD_VER_FOUND
FLUIDD_APP_FILE=$(find $FLUIDD_DIR/js -name "app.*.js" 2>/dev/null) if [ -e $FLUIDD_DIR/.version ]; then
if [ ! -z $FLUIDD_APP_FILE ]; then
FLUIDD_LOCAL_VER=$(grep -o -E '"version/setVersion",".+"' $FLUIDD_APP_FILE | cut -d'"' -f4)
FLUIDD_VER_FOUND="true" FLUIDD_VER_FOUND="true"
FLUIDD_LOCAL_VER=$(head -n 1 $FLUIDD_DIR/.version)
else else
FLUIDD_VER_FOUND="false" && unset FLUIDD_LOCAL_VER FLUIDD_VER_FOUND="false" && unset FLUIDD_LOCAL_VER
fi fi