Commit c60f4460d3e2dd320cbc3a6eba1171709c971a5a
1 parent
111ec509
No update info for travis AppImages
Showing
1 changed file
with
5 additions
and
7 deletions
appimage/build-appimage
| @@ -182,24 +182,22 @@ fi | @@ -182,24 +182,22 @@ fi | ||
| 182 | 182 | ||
| 183 | # Set up a version string to include in the AppImage name | 183 | # Set up a version string to include in the AppImage name |
| 184 | MAJOR_QPDF_VERSION=$( ./appdir/usr/bin/qpdf --version | grep "qpdf version" | awk '{print $3}' ) | 184 | MAJOR_QPDF_VERSION=$( ./appdir/usr/bin/qpdf --version | grep "qpdf version" | awk '{print $3}' ) |
| 185 | +declare -a UPDATE_INFO | ||
| 185 | if [ "$TRAVIS_JOB_NUMBER" != "" ]; then | 186 | if [ "$TRAVIS_JOB_NUMBER" != "" ]; then |
| 186 | VERSION=${MAJOR_QPDF_VERSION}-continuous-${TRAVIS_JOB_NUMBER}-$(date "+%Y-%m-%d")-git.$(git rev-parse --short HEAD) | 187 | VERSION=${MAJOR_QPDF_VERSION}-continuous-${TRAVIS_JOB_NUMBER}-$(date "+%Y-%m-%d")-git.$(git rev-parse --short HEAD) |
| 187 | - UPDATE_FLAG=-g | ||
| 188 | - UPDATE_INFO= | 188 | + # No update info supported for travis builds for now. |
| 189 | else | 189 | else |
| 190 | VERSION=${MAJOR_QPDF_VERSION} | 190 | VERSION=${MAJOR_QPDF_VERSION} |
| 191 | - UPDATE_FLAG=-u | ||
| 192 | - UPDATE_INFO="gh-releases-zsync|qpdf|qpdf|latest|qpdf-*x86_64.AppImage.zsync" | 191 | + UPDATE_INFO=(-u "gh-releases-zsync|qpdf|qpdf|latest|qpdf-*x86_64.AppImage.zsync") |
| 193 | fi | 192 | fi |
| 194 | 193 | ||
| 195 | # Remove the default AppRun/symlink and use our own custom AppRun script | 194 | # Remove the default AppRun/symlink and use our own custom AppRun script |
| 196 | rm appdir/AppRun; cp $top/appimage/AppRun appdir; chmod a+x appdir/AppRun | 195 | rm appdir/AppRun; cp $top/appimage/AppRun appdir; chmod a+x appdir/AppRun |
| 197 | 196 | ||
| 198 | -set +x | ||
| 199 | # Finally, generate the AppImage: | 197 | # Finally, generate the AppImage: |
| 200 | -PATH=./squashfs-root/usr/bin:$PATH ./squashfs-root/usr/bin/appimagetool $sign $UPDATE_FLAG "$UPDATE_INFO" $appimagetool_param appdir qpdf-$VERSION-x86_64.AppImage | ||
| 201 | - | 198 | +PATH=./squashfs-root/usr/bin:$PATH ./squashfs-root/usr/bin/appimagetool $sign $UPDATE_FLAG ${UPDATE_INFO[*]} $appimagetool_param appdir qpdf-$VERSION-x86_64.AppImage |
| 202 | 199 | ||
| 200 | +set +x | ||
| 203 | # Tell everyone where our result is stored: | 201 | # Tell everyone where our result is stored: |
| 204 | echo "" | 202 | echo "" |
| 205 | echo "=============================================================================" | 203 | echo "=============================================================================" |