diff --git a/APP-MANAGER b/APP-MANAGER index 083ceaeb3..12556a830 100644 --- a/APP-MANAGER +++ b/APP-MANAGER @@ -185,31 +185,32 @@ case "$1" in case $2 in am) echo '"AM" IS ALREADY INSTALLED!'; exit;; *) if test -f /opt/*$2*/remove; then - echo '"AM" HAS ALREADY INSTALLED "'$2'" PREVIOUSLY, THE DIRECTORY "/opt/'$2'" HAS ALREADY BEEN CREATED IN A PREVIOUS INSTALLATION! IF YOU HAVE ISSUES IN RUNNING THE PROGRAM, TRY TO REINSTALL IT USING THE FOLLOWING COMMAND:' && - echo "" && echo ' sudo am -r '$2' && sudo am -i '$2'' && echo "" && - echo 'OR REPORT THE BUG AT https://github.com/IVAN-HC/AM-APPLICATION-MANAGER/issues' && echo ""; exit; + echo '"AM" HAS ALREADY INSTALLED "'$2'" PREVIOUSLY, THE DIRECTORY "/opt/'$2'" HAS ALREADY BEEN CREATED IN A PREVIOUS INSTALLATION! IF YOU HAVE ISSUES IN RUNNING THE PROGRAM, TRY TO REINSTALL IT USING THE FOLLOWING COMMAND:' && + echo "" && echo ' sudo am -r '$2' && sudo am -i '$2'' && echo "" && + echo 'OR REPORT THE BUG AT HTTPS://github.com/IVAN-HC/AM-APPLICATION-MANAGER/issues' && echo ""; exit; else - if curl --output /dev/null --silent --head --fail $URL/programs/$arch/$2 1>/dev/null; then - case $2 in - *) for var in $2; - do cd /opt/am/.cache; mkdir tmp; cd tmp; wget -q $URL/programs/$arch/$2; cd ..; mv ./tmp/$2 ./$2; rmdir ./tmp; - chmod a+x /opt/am/.cache/$2; sudo /opt/am/.cache/$2; chown -R $currentuser /opt/am/.cache/*; echo ""; - unset $LATESTSCRIPT - LATESTSCRIPT=$(cd /opt/am/.cache && ls -tp | grep -v /$ | head -1) - if test -f /opt/*$2*/remove; then - clear; echo ' "'$LATESTSCRIPT'" has been installed!' | tr a-z A-Z && am -a $LATESTSCRIPT && chown -R $currentuser /opt/am/.cache/about 2> /dev/null; - else - echo " INSTALLATION ABORTED!"; - fi - exit; done - esac - else - echo ""; - echo ' "'$2'" IS NOT A VALID ARGUMENT, PLEASE RUN THE "am -l" COMMAND'; echo ""; - echo ' TO SEE THE LIST OF ALL THE APPLICATIONS AVAILABLE FOR '$arch''; echo ""; - echo ' OR START A SEARCH (WITH KEYWORDS) BY USING THE "am -q" COMMAND'; echo ""; - exit; - fi + if curl --output /dev/null --silent --head --fail $URL/programs/$arch/$2 1>/dev/null; then + case $2 in + *) for var in $2; + do cd /opt/am/.cache; mkdir tmp; cd tmp; wget -q $URL/programs/$arch/$2; cd ..; mv ./tmp/$2 ./$2; rmdir ./tmp; + chmod a+x /opt/am/.cache/$2; sudo /opt/am/.cache/$2; chown -R $currentuser /opt/am/.cache/*; echo ""; + unset $LATESTSCRIPT + LATESTSCRIPT=$(cd /opt/am/.cache && ls -tp | grep -v /$ | head -1) + if test -f /opt/*$2*/remove; then + clear; + echo ' "'$LATESTSCRIPT'" has been installed!' | tr a-z A-Z && am -a $LATESTSCRIPT && chown -R $currentuser /opt/am/.cache/about 2> /dev/null; + else + echo " INSTALLATION ABORTED!"; + fi + exit; done + esac + else + echo ""; + echo ' "'$2'" IS NOT A VALID ARGUMENT, PLEASE RUN THE "am -l" COMMAND'; echo ""; + echo ' TO SEE THE LIST OF ALL THE APPLICATIONS AVAILABLE FOR '$arch''; echo ""; + echo ' OR START A SEARCH (WITH KEYWORDS) BY USING THE "am -q" COMMAND'; echo ""; + exit; + fi fi esac done @@ -257,9 +258,9 @@ case "$1" in shift;; '-s'|'sync') rm -R -f /opt/am/$arch-apps /opt/am/list && wget -q $URL/programs/$arch-apps -P /opt/am && echo -e "$(cat /opt/am/x86_64-apps | awk -v FS="(◆ | : )" '{print $2}')" >> /opt/am/list cd /opt/am && cat options >> list - echo ""; echo ' SYNCHRONIZING "AM"...'; sleep 1; echo ""; + echo ""; echo ' SYNCHRONIZING "AM" VERSION '$(am -v)'...'; sleep 1; echo ""; rm -R -f /opt/am/.cache/* 1>/dev/null; cd /opt/am/.cache; wget -q $URL/APP-MANAGER && chmod a+x ./APP-MANAGER; cd ..; - mv /opt/am/.cache/APP-MANAGER /opt/am; chown -R $currentuser /opt/am; echo ' THE "AM" SCRIPT IS NOW UPDATED TO THE LATEST VERSION! '; echo "";; + mv /opt/am/.cache/APP-MANAGER /opt/am; chown -R $currentuser /opt/am; echo ' THE "AM" SCRIPT IS NOW UPDATED TO THE '$(am -v)' VERSION! '; echo "";; '-t'|'template') while [ -n "$1" ] do @@ -420,6 +421,6 @@ case "$1" in fi done shift;; - 'version'|'-v'|'--version') echo "2.3.1-2";; + 'version'|'-v'|'--version') echo "2.4.0";; *) exec /opt/am/APP-MANAGER ;; esac \ No newline at end of file