cleaned up linux-update.sh

scripts/linux-update.sh

@@ -14,15 +14,15 @@ else
   exit 1
 fi
 SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
-FOLDER="Organizr-"${BRANCH#v}
+UPGRADEPATH=$SCRIPTPATH"/upgrade"
+UPGRADEFILE=$SCRIPTPATH"/upgrade/upgrade.zip"
+FOLDER=$UPGRADEPATH"/Organizr-"${BRANCH#v}
 URL=https://github.com/causefx/Organizr/archive/${BRANCH}.zip
-mkdir -p $SCRIPTPATH"/upgrade"                                                   && \
-cd $SCRIPTPATH"/upgrade"                                                         && \
-curl -sSL ${URL} > upgrade.zip                                                   && \
-unzip upgrade.zip                                                                && \
-cd $SCRIPTPATH"/upgrade/"${FOLDER}                                               && \
-cp -r ./ ../../../                                                               && \
-cd ../                                                                           && \
-rm upgrade.zip                                                                   && \
-rm -rf ${FOLDER}                                                                 && \
+mkdir -p $UPGRADEPATH                                                  && \
+curl -sSL ${URL} > $UPGRADEFILE                                        && \
+unzip $UPGRADEFILE -d $UPGRADEPATH                                     && \
+cp -r $FOLDER/ $SCRIPTPATH/../                                         && \
+rm $UPGRADEFILE                                                        && \
+rm -rf $FOLDER                                                         && \
+rm -rf $UPGRADEPATH                                                    && \
 exit 0