diff --git a/run.sh b/run.sh index 527007a..2d22352 100755 --- a/run.sh +++ b/run.sh @@ -31,9 +31,11 @@ if [ "${1}" == "update" ]; then fi cd /opt/idssys/defaults if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then - if [ "${2}" != "qq" ]; then + if [ "${2}" != "q" ]; then echo -en "\e[1A"; echo -e "\e[0K\r ${idsCL[LightCyan]}Updating iDSSYS-Defaults...${idsCL[Default]}" + else + echo -e "${idsCL[LightCyan]}Updating iDSSYS-Defaults...${idsCL[Default]}" fi git fetch origin master >/dev/null 2>&1 git reset --hard origin/master >/dev/null 2>&1 @@ -46,9 +48,11 @@ if [ "${1}" == "update" ]; then cd ${MMFOLDER} if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then - if [ "${2}" != "qq" ]; then + if [ "${2}" != "q" ]; then echo -en "\e[1A"; echo -e "\e[0K\r ${idsCL[LightCyan]}Installing mediamanager updates...${idsCL[Default]}" + else + echo -e "${idsCL[LightCyan]}Installing mediamanager updates...${idsCL[Default]}" fi git fetch origin master >/dev/null 2>&1 git reset --hard origin/master >/dev/null 2>&1 @@ -58,14 +62,18 @@ if [ "${1}" == "update" ]; then git pull >/dev/null 2>&1 git submodule update --remote >/dev/null 2>&1 /bin/chmod +x ${MMFOLDER}/mm-scripts.sh 2>&1 - if [ "${2}" != "qq" ]; then + source /opt/idssys/mediamanager/defaults.inc + if [ "${2}" != "q" ]; then echo -en "\e[1A"; - source /opt/idssys/mediamanager/defaults.inc echo -e "\e[0K\r ${idsCL[Green]}Update to v${VERS} complete${idsCL[Default]}" + else + echo -e "${idsCL[Green]}Update to v${VERS} complete${idsCL[Default]}" fi - elif [ "${2}" != "qq" ]; then + elif [ "${2}" != "q" ]; then echo -en "\e[1A"; echo -e "\e[0K\r ${idsCL[LightCyan]}No Updates Available${idsCL[Default]}" + else + echo -e "${idsCL[LightCyan]}No Updates Available${idsCL[Default]}" fi /bin/rm -f ${MMFOLDER}/update.available