Merge branch 'feature/fhs' of https://github.com/probonopd/linuxdeployqt into feature/fhs

.travis.yml

@@ -14,10 +14,7 @@ before_install:
   - make -j7
   - sudo make install
   - cd -
-  - ID=$(wget -q https://api.travis-ci.org/repos/probonopd/appimagetool/builds -O - | head -n 1 | sed -e 's|}|\n|g' | grep '"result":0' | head -n 1 | sed -e 's|,|\n|g' | grep '"id"' | cut -d ":" -f 2)
+  - sudo wget -c "https://github.com/probonopd/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage" -O /usr/local/bin/appimagetool
-  - URL=$(wget -q "http://archive.travis-ci.org/jobs/$((ID+1))/log.txt" -O - | grep -o "https://transfer.sh/.*/appimagetool" | tail -n 1 | sed -e 's|\r||g')
-  - if [ -z "$URL" ] ; then URL=$(wget -q "http://archive.travis-ci.org/jobs/$((ID+2))/log.txt" -O - | grep -o "https://transfer.sh/.*/appimagetool" | tail -n 1 | sed -e 's|\r||g') ; fi
-  - sudo wget -c "$URL" -O /usr/local/bin/appimagetool
   - sudo chmod a+x /usr/local/bin/appimagetool
   
 install:
@@ -34,4 +31,10 @@ script:
   - export VERSION=$(git describe --always)
   - ./linuxdeployqt/linuxdeployqt linuxdeployqt.AppDir/linuxdeployqt -verbose=3 -appimage
   - ls -lh
-  - curl --upload-file ./linuxdeployqt-*.AppImage https://transfer.sh/linuxdeployqt-$VERSION-x86_64.appimage
+  - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
+  - bash ./upload.sh ./linuxdeployqt-*.AppImage
+
+branches:
+  except:
+    - # Do not build tags that we create when we upload to GitHub Releases
+    - /^(?i:continuous)$/