appveyor: Some refactoring

appveyor.yml

@@ -28,11 +28,11 @@ build_script:
       chmod -R 777 /appveyor/projects
 
       apk add curl jq
-      if [ $? -eq 0 ]; then
+      if [ $? -ne 0 ]; then
-        echo "Finished installling curl and jq"
-      else
         exit 1
       fi
+      
+      echo "Finished installling curl and jq"
 
       SUCCESS=1
 
@@ -49,64 +49,57 @@ build_script:
 
         if [ $? -eq 0 ] ; then
           echo "Skipping $f since $CURR_NAME already exists";
-        else
+          continue;
-          rm base
-          cp -Rf ../base ./base
-
-          mv package.json fuck-you-npm-package.json
-          mv build-package.json package.json
-
-          npm install
-          CHECK=$?
-          if [ $CHECK -ne 0 ]; then
-            echo "Command failed with error code $CHECK"
-            SUCCESS=0;
-            continue;
-          fi;
-
-          npm run build
-          CHECK=$?
-          if [ $CHECK -ne 0 ]; then
-            echo "Command failed with error code $CHECK"
-            SUCCESS=0;
-            continue;
-          fi;
-
-          mv package.json build-package.json
-          mv fuck-you-npm-package.json package.json 
-
-          ../7zas a -xr!*.xcf -mx9 "${CURR_VER}_build-sc.7z" package.json index.mjs api base public
-          echo "Creating release on gitea"
-          RELEASE_RESULT=$(curl \
-            -X POST \
-            -H "Authorization: token $deploytoken" \
-            -H "Content-Type: application/json" \
-            https://git.nfp.is/api/v1/repos/$APPVEYOR_REPO_NAME/releases \
-            -d "{\"tag_name\":\"${CURR_VER}\",\"name\":\"${CURR_NAME}\",\"body\":\"Automatic release from Appveyor from ${APPVEYOR_REPO_COMMIT} :\n\n${APPVEYOR_REPO_COMMIT_MESSAGE}\"}")
-          CHECK=$?
-          if [ $CHECK -ne 0 ]; then
-            echo "Command failed with error code $CHECK"
-            SUCCESS=0;
-            continue;
-          fi;
-          RELEASE_ID=$(echo $RELEASE_RESULT | jq -r .id)
-          echo "Adding ${CURR_VER}_build-sc.7z to release ${RELEASE_ID}"
-          curl \
-            -X POST \
-            -H "Authorization: token $deploytoken" \
-            -F "attachment=@${CURR_VER}_build-sc.7z" \
-            https://git.nfp.is/api/v1/repos/$APPVEYOR_REPO_NAME/releases/$RELEASE_ID/assets
-          CHECK=$?
-          if [ $CHECK -ne 0 ]; then
-            echo "Command failed with error code $CHECK"
-            SUCCESS=0;
-            continue;
-          fi;
-
-          echo "Deplying to production"
-          echo "curl -X POST http://192.168.93.50:$MAN_PORT/update/$MAN_NAME"
-          curl -X POST http://192.168.93.50:$MAN_PORT/update/$MAN_NAME
         fi
+
+        rm base
+        cp -Rf ../base ./base
+
+        mv package.json fuck-you-npm-package.json
+        mv build-package.json package.json
+
+        npm install && npm run build
+        CHECK=$?
+        if [ $CHECK -ne 0 ]; then
+          echo "Command failed with error code $CHECK"
+          SUCCESS=0;
+          continue;
+        fi;
+
+        mv package.json build-package.json
+        mv fuck-you-npm-package.json package.json 
+
+        ../7zas a -xr!*.xcf -mx9 "${CURR_VER}_build-sc.7z" package.json index.mjs api base public
+        echo "Creating release on gitea"
+        RELEASE_RESULT=$(curl \
+          -X POST \
+          -H "Authorization: token $deploytoken" \
+          -H "Content-Type: application/json" \
+          https://git.nfp.is/api/v1/repos/$APPVEYOR_REPO_NAME/releases \
+          -d "{\"tag_name\":\"${CURR_VER}\",\"name\":\"${CURR_NAME}\",\"body\":\"Automatic release from Appveyor from ${APPVEYOR_REPO_COMMIT} :\n\n${APPVEYOR_REPO_COMMIT_MESSAGE}\"}")
+        CHECK=$?
+        if [ $CHECK -ne 0 ]; then
+          echo "Command failed with error code $CHECK"
+          SUCCESS=0;
+          continue;
+        fi;
+        RELEASE_ID=$(echo $RELEASE_RESULT | jq -r .id)
+        echo "Adding ${CURR_VER}_build-sc.7z to release ${RELEASE_ID}"
+        curl \
+          -X POST \
+          -H "Authorization: token $deploytoken" \
+          -F "attachment=@${CURR_VER}_build-sc.7z" \
+          https://git.nfp.is/api/v1/repos/$APPVEYOR_REPO_NAME/releases/$RELEASE_ID/assets
+        CHECK=$?
+        if [ $CHECK -ne 0 ]; then
+          echo "Command failed with error code $CHECK"
+          SUCCESS=0;
+          continue;
+        fi;
+
+        echo "Deplying to production"
+        echo "curl -X POST http://192.168.93.50:$MAN_PORT/update/$MAN_NAME"
+        curl -X POST http://192.168.93.50:$MAN_PORT/update/$MAN_NAME
         cd ..
       done