chore: restruture
This commit is contained in:
@@ -98,9 +98,9 @@ cp $(find_libs) "${coop_dir}/lib"
|
||||
|
||||
# Icons
|
||||
mkdir -p "${coop_dir}/share/icons/hicolor/512x512/apps"
|
||||
cp "crates/coop/resources/icon.png" "${coop_dir}/share/icons/hicolor/512x512/apps/coop.png"
|
||||
cp "desktop/resources/icon.png" "${coop_dir}/share/icons/hicolor/512x512/apps/coop.png"
|
||||
mkdir -p "${coop_dir}/share/icons/hicolor/1024x1024/apps"
|
||||
cp "crates/coop/resources/icon@2x.png" "${coop_dir}/share/icons/hicolor/1024x1024/apps/coop.png"
|
||||
cp "desktop/resources/icon@2x.png" "${coop_dir}/share/icons/hicolor/1024x1024/apps/coop.png"
|
||||
|
||||
# .desktop
|
||||
export DO_STARTUP_NOTIFY="true"
|
||||
@@ -110,7 +110,7 @@ export APP_ARGS="%U"
|
||||
export APP_NAME="Coop"
|
||||
|
||||
mkdir -p "${coop_dir}/share/applications"
|
||||
envsubst < "crates/coop/resources/coop.desktop.in" > "${coop_dir}/share/applications/coop.desktop"
|
||||
envsubst < "desktop/resources/coop.desktop.in" > "${coop_dir}/share/applications/coop.desktop"
|
||||
|
||||
# Create archive out of everything that's in the temp directory
|
||||
arch=$(uname -m)
|
||||
|
||||
@@ -21,11 +21,11 @@ export DO_STARTUP_NOTIFY="true"
|
||||
export APP_NAME="Coop"
|
||||
export APP_ICON="\${SNAP}/meta/gui/coop.png"
|
||||
export APP_ARGS="%U"
|
||||
envsubst < "crates/coop/resources/coop.desktop.in" > "snap/gui/coop.desktop"
|
||||
cp "crates/coop/resources/icon.png" "snap/gui/coop.png"
|
||||
envsubst < "desktop/resources/coop.desktop.in" > "snap/gui/coop.desktop"
|
||||
cp "desktop/resources/icon.png" "snap/gui/coop.png"
|
||||
|
||||
# Generate snapcraft.yaml with version and architecture
|
||||
RELEASE_VERSION="$1" ARCH_SUFFIX="$ARCH_SUFFIX" envsubst < crates/coop/resources/snap/snapcraft.yaml.in > snap/snapcraft.yaml
|
||||
RELEASE_VERSION="$1" ARCH_SUFFIX="$ARCH_SUFFIX" envsubst < desktop/resources/snap/snapcraft.yaml.in > snap/snapcraft.yaml
|
||||
|
||||
# Clean previous builds
|
||||
snapcraft clean
|
||||
|
||||
@@ -24,7 +24,7 @@ export ICON_FILE="icon"
|
||||
export CHANNEL="stable"
|
||||
|
||||
# Generate manifest
|
||||
envsubst < "crates/coop/resources/flatpak/manifest-template.json" > "$APP_ID.json"
|
||||
envsubst < "desktop/resources/flatpak/manifest-template.json" > "$APP_ID.json"
|
||||
|
||||
# Build Flatpak
|
||||
flatpak-builder --user --install --force-clean build "$APP_ID.json"
|
||||
|
||||
@@ -93,7 +93,7 @@ echo " Created flathub/release-info.xml"
|
||||
# Step 4: Generate the metainfo file with release info
|
||||
echo "[4/5] Generating metainfo.xml..."
|
||||
export APP_ID APP_NAME BRANDING_LIGHT BRANDING_DARK
|
||||
cat crates/coop/resources/flatpak/coop.metainfo.xml.in | \
|
||||
cat desktop/resources/flatpak/coop.metainfo.xml.in | \
|
||||
sed -e "/@release_info@/r flathub/release-info.xml" -e '/@release_info@/d' \
|
||||
> flathub/${APP_ID}.metainfo.xml
|
||||
echo " Created flathub/${APP_ID}.metainfo.xml"
|
||||
@@ -153,8 +153,8 @@ modules:
|
||||
- install -Dm755 target/release/coop /app/bin/coop
|
||||
|
||||
# Install icons
|
||||
- install -Dm644 crates/coop/resources/icon.png /app/share/icons/hicolor/512x512/apps/su.reya.coop.png
|
||||
- install -Dm644 crates/coop/resources/icon@2x.png /app/share/icons/hicolor/1024x1024/apps/su.reya.coop.png
|
||||
- install -Dm644 desktop/resources/icon.png /app/share/icons/hicolor/512x512/apps/su.reya.coop.png
|
||||
- install -Dm644 desktop/resources/icon@2x.png /app/share/icons/hicolor/1024x1024/apps/su.reya.coop.png
|
||||
|
||||
# Install desktop file
|
||||
- |
|
||||
@@ -164,7 +164,7 @@ modules:
|
||||
export APP_CLI="coop"
|
||||
export APP_ARGS="%U"
|
||||
export DO_STARTUP_NOTIFY="true"
|
||||
envsubst < crates/coop/resources/coop.desktop.in > coop.desktop
|
||||
envsubst < desktop/resources/coop.desktop.in > coop.desktop
|
||||
install -Dm644 coop.desktop /app/share/applications/su.reya.coop.desktop
|
||||
|
||||
# Install metainfo (use pre-generated one with release info)
|
||||
|
||||
@@ -13,7 +13,7 @@ fi
|
||||
|
||||
NEW_VERSION="$1"
|
||||
WORKSPACE_CARGO="Cargo.toml"
|
||||
CRATE_CARGO="crates/coop/Cargo.toml"
|
||||
CRATE_CARGO="desktop/Cargo.toml"
|
||||
|
||||
# Check if both Cargo.toml files exist
|
||||
if [ ! -f "$WORKSPACE_CARGO" ]; then
|
||||
|
||||
Reference in New Issue
Block a user