Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add AppImage update information #1228

Merged
merged 1 commit into from
Nov 26, 2017
Merged

Conversation

phoerious
Copy link
Member

Description

This patch resolves #1157 by embedding update information into the AppImage.

How has this been tested?

./KeePassXC-*.AppImage shows the correct update information according to the specification. The actual AppImageUpdate tool could not be tested, because it crashes.

Types of changes

  • ✅ New feature (non-breaking change which adds functionality)

Checklist:

  • ✅ I have read the CONTRIBUTING document. [REQUIRED]
  • ✅ My code follows the code style of this project. [REQUIRED]
  • ✅ All new and existing tests passed. [REQUIRED]
  • ✅ I have compiled and verified my code with -DWITH_ASAN=ON. [REQUIRED]

@@ -38,6 +38,10 @@ export ARCH=x86_64

mkdir -p $APP.AppDir
wget -q https://github.com/AppImage/AppImages/raw/master/functions.sh -O ./functions.sh

# allow overriding of appimagetool parameters, see https://github.com/AppImage/AppImageKit/issues/549
sed -i 's/"\$appimagetool" -/"$appimagetool" $@ -/' ./functions.sh

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please send a PR for this in the AppImage/AppImages project. Thanks!

@TheAssassin
Copy link
Contributor

You shouldn't have to install zsync by the way. It comes bundled with appimagetool.

@phoerious
Copy link
Member Author

I was too lazy to check where I need to call it from. It's not in the PATH.

@TheAssassin
Copy link
Contributor

Oh, so you need it for something other than appimagetool?

@phoerious
Copy link
Member Author

Our recipe moves the AppImage around and deletes the glibc version from the filename. Therefore the filename and URL stored in the auto-generated zsync file doesn't match the actual filename anymore. Hence I simply regenerate it afterwards. It's a dirty hack, but it works. Perhaps that's not needed anymore if you merge AppImageCommunity/pkg2appimage#285

@probonopd
Copy link

Merged.

@phoerious phoerious force-pushed the hotfix/1157-appimageupdate branch from e452f1f to 9f886a7 Compare November 26, 2017 14:24
@phoerious
Copy link
Member Author

Thanks. I updated my PR here to throw away the obsolete generate_type2_appimage and zsync fixes.

@phoerious phoerious force-pushed the hotfix/1157-appimageupdate branch from 9f886a7 to ce69ba3 Compare November 26, 2017 14:38
@phoerious phoerious force-pushed the hotfix/1157-appimageupdate branch from ce69ba3 to 7a6b321 Compare November 26, 2017 17:07
@phoerious phoerious changed the base branch from develop to release/2.2.3 November 26, 2017 17:07
@phoerious phoerious merged commit b20918b into release/2.2.3 Nov 26, 2017
@phoerious phoerious deleted the hotfix/1157-appimageupdate branch November 26, 2017 17:18
droidmonkey added a commit that referenced this pull request Dec 12, 2017
- Prevent database corruption when locked [#1219]
- Fixes apply button not saving new entries [#1141]
- Switch to Consolas font on Windows for password edit [#1229]
- Multiple fixes to AppImage deployment [#1115, #1228]
- Fixes multiple memory leaks [#1213]
- Resize message close to 16x16 pixels [#1253]
phoerious added a commit that referenced this pull request Dec 13, 2017
- Prevent database corruption when locked [#1219]
- Fixes apply button not saving new entries [#1141]
- Switch to Consolas font on Windows for password edit [#1229]
- Multiple fixes to AppImage deployment [#1115, #1228]
- Fixes multiple memory leaks [#1213]
- Resize message close to 16x16 pixels [#1253]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants