clean deploy scripts

freemountain · Feb 4, 2017 · c90484f · c90484f
1 parent 2ce862e
commit c90484f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -44,7 +44,17 @@ deploy:
     prerelease: true
     api_key:
       secure: IckXTW+tOTID4xV9tc1arkNlJPNA7gUfziDbWyjuqxgmIdrMJthpT6BSzhaCb3+yFqXDDuNn73li4SJz0Xy6jvQXLK+Jgsl3iyOButiyq7X61bxeA0fd9Kc5Y3P7lVQbYPvaczIRT0NOBPwmRjPZr1bvIESS/jnVvBF0uM+jIilJAMDYVBcSr0jZz0JJLs9eBTBZiH6lH1FD1NWhBpYpYA0P39O39nofZOGvZRdRgZ97pxBRGhVhjy5LwysDnza78ik92lQSBb1PcItM4wm9gt6eEBjgvP/rfl5JHn0ST5226Me98Ppq88hJ5sCZRXdmWg30CJ4WrTg/NCEp/bZXx8m2iKSA0QCei9Et8nnlSSYzrMGfTCvGbFLKWb027rcNsbohkfUTV8BKooPPSx/24t3lN6J3baYLD4ilDwkBAGouKti4+qLkT5BipxTOeBIW6Ot/SW7kv7ivnqrLsCzNHrtlqawURmaOSot4Noz0j4ZyuH1jbML3NsqNBCWZDsTsnLCkXYz05zPF+xtXxIUR8X6SKILWMp531aIhU/hhOcl8ajBp4ri+JQwTIqqXfkBidzfTI+d94EWukDclEa4YDqAO8FLLVv1cIwZH3PrqWH8dRrOxdUZTB+dTohJkkwufoMAvy83AoE1T3gpdd8JNdRJP+h6jC3HTCQLFw3gmkpA=
-    file: /home/travis/build/freemountain/quark/dist/win/quark-win.zip
+    file: /home/travis/build/freemountain/quark/dist/win/quark-win-x86.zip
+    skip_cleanup: true
+    on:
+      tags: true
+      repo: freemountain/quark
+      condition: $TRAVIS_OS_NAME = linux
+  - provider: releases
+    prerelease: true
+    api_key:
+      secure: IckXTW+tOTID4xV9tc1arkNlJPNA7gUfziDbWyjuqxgmIdrMJthpT6BSzhaCb3+yFqXDDuNn73li4SJz0Xy6jvQXLK+Jgsl3iyOButiyq7X61bxeA0fd9Kc5Y3P7lVQbYPvaczIRT0NOBPwmRjPZr1bvIESS/jnVvBF0uM+jIilJAMDYVBcSr0jZz0JJLs9eBTBZiH6lH1FD1NWhBpYpYA0P39O39nofZOGvZRdRgZ97pxBRGhVhjy5LwysDnza78ik92lQSBb1PcItM4wm9gt6eEBjgvP/rfl5JHn0ST5226Me98Ppq88hJ5sCZRXdmWg30CJ4WrTg/NCEp/bZXx8m2iKSA0QCei9Et8nnlSSYzrMGfTCvGbFLKWb027rcNsbohkfUTV8BKooPPSx/24t3lN6J3baYLD4ilDwkBAGouKti4+qLkT5BipxTOeBIW6Ot/SW7kv7ivnqrLsCzNHrtlqawURmaOSot4Noz0j4ZyuH1jbML3NsqNBCWZDsTsnLCkXYz05zPF+xtXxIUR8X6SKILWMp531aIhU/hhOcl8ajBp4ri+JQwTIqqXfkBidzfTI+d94EWukDclEa4YDqAO8FLLVv1cIwZH3PrqWH8dRrOxdUZTB+dTohJkkwufoMAvy83AoE1T3gpdd8JNdRJP+h6jC3HTCQLFw3gmkpA=
+    file: /home/travis/build/freemountain/quark/dist/linux/quark-linux-x86_64.zip
     skip_cleanup: true
     on:
       tags: true

diff --git a/configure b/configure
@@ -42,6 +42,13 @@ if [[ "$OSTYPE" == "linux-gnu" ]]; then
       mv "linuxdeployqt-continuous-x86_64.AppImage" "linuxdeployqt"
       chmod +x "linuxdeployqt"
   fi
+
+  if [ ! -f "$BIN_PATH/appimagetool" ] ; then
+      cd "$BIN_PATH"
+      wget "https://github.com/probonopd/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
+      mv "appimagetool-x86_64.AppImage" "appimagetool"
+      chmod +x "appimagetool"
+  fi
 fi
 
 popd > /dev/null
diff --git a/tools/deploy_linux.sh b/tools/deploy_linux.sh
@@ -35,5 +35,6 @@ PATH="$QT_PATH:$PATH"
 cd "$DIST_PATH"
 $DEPLOY_CMD
 $DEPLOY_CMD -appimage
+zip -r quark-linux-x86_64.zip QuarkGui
 
 popd > /dev/null
diff --git a/tools/deploy_win.sh b/tools/deploy_win.sh
@@ -10,5 +10,5 @@ rm -rf "$PROJECT_PATH/dist/win"
 
 "$PROJECT_PATH/qbs_wrapper" install --install-root "$PROJECT_PATH/dist/win" -p $TARGET_APP profile:$PROFILE
 cd "$PROJECT_PATH/dist/win"
-zip -r quark-win.zip QuarkGui
+zip -r quark-win-x86.zip QuarkGui
 popd > /dev/null