From 3032356f89e6ae26bf6eba1ba675abb86de2923d Mon Sep 17 00:00:00 2001 From: domi Date: Fri, 4 Dec 2020 16:43:51 +0100 Subject: [PATCH] fix: bug that caused the script to hang because the file that was searched for was not found --- scripts/status.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/status.sh b/scripts/status.sh index 8edf346..ee410f1 100755 --- a/scripts/status.sh +++ b/scripts/status.sh @@ -356,8 +356,8 @@ compare_moonraker_versions(){ read_local_mainsail_version(){ unset MAINSAIL_VER_FOUND - if [ -d $MAINSAIL_DIR/js ] && [ "$(ls -A $MAINSAIL_DIR/js)" ]; then - MAINSAIL_APP_FILE=$(find $MAINSAIL_DIR/js -name "app.*.js") + 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) MAINSAIL_VER_FOUND="true" else @@ -396,8 +396,8 @@ compare_mainsail_versions(){ read_local_fluidd_version(){ unset FLUIDD_VER_FOUND - if [ -d $FLUIDD_DIR/js ] && [ "$(ls -A $FLUIDD_DIR/js)" ]; then - FLUIDD_APP_FILE=$(find $FLUIDD_DIR/js -name "app.*.js") + 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 '"setVersion",".+"' $FLUIDD_APP_FILE | cut -d'"' -f4) FLUIDD_VER_FOUND="true" else