From 738269adaea1bc6c4a43dabb22e0030724587329 Mon Sep 17 00:00:00 2001 From: th33xitus Date: Thu, 21 Jan 2021 11:28:31 +0100 Subject: [PATCH] fix: make use of the delivered .version files to read mainsail and fluidd version --- scripts/status.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/scripts/status.sh b/scripts/status.sh index 5c5a204..befe6fa 100755 --- a/scripts/status.sh +++ b/scripts/status.sh @@ -400,10 +400,9 @@ compare_moonraker_versions(){ read_local_mainsail_version(){ unset MAINSAIL_VER_FOUND - MAINSAIL_APP_FILE=$(find $MAINSAIL_DIR/js -name "app.*.js" 2>/dev/null) - if [ ! -z $MAINSAIL_APP_FILE ]; then - MAINSAIL_LOCAL_VER=$(grep -o -E 'state:{packageVersion:.+' $MAINSAIL_APP_FILE | cut -d'"' -f2) + if [ -e $MAINSAIL_DIR/.version ]; then MAINSAIL_VER_FOUND="true" + MAINSAIL_LOCAL_VER=$(head -n 1 $MAINSAIL_DIR/.version) else MAINSAIL_VER_FOUND="false" && unset MAINSAIL_LOCAL_VER fi @@ -440,10 +439,9 @@ compare_mainsail_versions(){ read_local_fluidd_version(){ unset FLUIDD_VER_FOUND - FLUIDD_APP_FILE=$(find $FLUIDD_DIR/js -name "app.*.js" 2>/dev/null) - if [ ! -z $FLUIDD_APP_FILE ]; then - FLUIDD_LOCAL_VER=$(grep -o -E '"version/setVersion",".+"' $FLUIDD_APP_FILE | cut -d'"' -f4) + if [ -e $FLUIDD_DIR/.version ]; then FLUIDD_VER_FOUND="true" + FLUIDD_LOCAL_VER=$(head -n 1 $FLUIDD_DIR/.version) else FLUIDD_VER_FOUND="false" && unset FLUIDD_LOCAL_VER fi