mirror of
https://github.com/storytold/deckcraft.git
synced 2026-10-29 04:56:58 -06:00
The AppImage and DeckCraft.app ship the licence files
The AppImage step moved usr/share/doc out of the AppDir, so the AppImage shipped without the licence files the .deb, .rpm and .tar.gz carry from the same staged tree. DeckCraft.app only got the craft-fonts licences, and no licence at all when built without CRAFT_FONTS_DIR. Keep usr/share/doc in the AppDir, and copy the docs into the app bundle with copy_docs, as the CLI zip does, before signing.
This commit is contained in:
@@ -101,7 +101,6 @@ fi
|
||||
if has appimage; then
|
||||
APPDIR="$WORK/DeckCraft.AppDir"
|
||||
cp -R "$STAGE" "$APPDIR"
|
||||
mv "$APPDIR/usr/share/doc" "$WORK/doc-unused"
|
||||
ln -s usr/bin/deckcraft "$APPDIR/AppRun"
|
||||
cp "$HERE/$APP_ID.desktop" "$APPDIR/$APP_ID.desktop"
|
||||
cp "$ROOT/assets/app-icon/hicolor/256x256/apps/$APP_ID.png" "$APPDIR/$APP_ID.png"
|
||||
|
||||
@@ -103,8 +103,9 @@ mkdir -p "$APP/Contents/MacOS" "$APP/Contents/Resources"
|
||||
# Executable and icon carry the display name (CFBundleExecutable / CFBundleIconFile).
|
||||
cp "$WORK/bin/deckcraft" "$APP/Contents/MacOS/DeckCraft"
|
||||
cp "$ROOT/assets/app-icon/deckcraft.icns" "$APP/Contents/Resources/DeckCraft.icns"
|
||||
# Licences of the embedded craft-fonts fonts (only when built with CRAFT_FONTS_DIR).
|
||||
copy_font_licences "$APP/Contents/Resources"
|
||||
# The licences and README, as in the CLI zip, plus the licences of the embedded craft-fonts
|
||||
# fonts when built with CRAFT_FONTS_DIR. Before signing, so the seal covers them.
|
||||
copy_docs "$APP/Contents/Resources"
|
||||
sed -e "s/@VERSION@/$VERSION/g" -e "s/@SHORT_VERSION@/$SHORT_VERSION/g" \
|
||||
-e "s/@BUILD_SHA@/${DECKCRAFT_BUILD_SHA:-unknown}/g" \
|
||||
"$HERE/Info.plist.in" >"$APP/Contents/Info.plist"
|
||||
|
||||
Reference in New Issue
Block a user