diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 47d79fef..b1df2235 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -225,7 +225,7 @@ jobs: - name: Install packaging tools run: | - cargo install cargo-bundle toml-cli + cargo install toml-cli brew install create-dmg - uses: actions/download-artifact@v3 @@ -238,20 +238,21 @@ jobs: run: | VERSION=$(toml get Cargo.toml package.version --raw) sed -i'.bak' -e "s/0\.0\.0/${VERSION}/g" -e "s/fffffff/${GITHUB_SHA:0:7}/g" resources/packaging/macos/Info.plist - cargo bundle --release targets=( x86_64-apple-darwin aarch64-apple-darwin ) mkdir artifacts for target in "${targets[@]}"; do - cp -R target/release/bundle target/${target}/release - cp -f target/${target}/release/sniffnet \ - target/${target}/release/bundle/osx/Sniffnet.app/Contents/MacOS/sniffnet - cp resources/packaging/macos/wrapper.sh \ - target/${target}/release/bundle/osx/Sniffnet.app/Contents/MacOS/wrapper.sh + mkdir -p target/${target}/release/bundle/osx/Sniffnet.app/Contents/{MacOS,Resources} cp resources/packaging/macos/Info.plist \ - target/${target}/release/bundle/osx/Sniffnet.app/Contents/Info.plist + target/${target}/release/bundle/osx/Sniffnet.app/Contents/ + cp resources/packaging/macos/graphics/sniffnet.icns \ + target/${target}/release/bundle/osx/Sniffnet.app/Contents/Resources/ + cp target/${target}/release/sniffnet \ + target/${target}/release/bundle/osx/Sniffnet.app/Contents/MacOS/ + cp resources/packaging/macos/wrapper.sh \ + target/${target}/release/bundle/osx/Sniffnet.app/Contents/MacOS/ create-dmg \ --volname "Sniffnet Installer" \ --background "resources/packaging/macos/graphics/dmg_bg.png" \ diff --git a/Cargo.toml b/Cargo.toml index 4c1e8e26..c0ace2f7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -152,15 +152,5 @@ fontconfig = "*" #─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── -[package.metadata.bundle] -name = "Sniffnet" -category = "Utilities" -identifier = "io.github.gyulyvgc.sniffnet" -icon = [ - "resources/packaging/macos/graphics/sniffnet.icns" -] - -#─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────── - [package.metadata.wix] include = [".\\resources\\packaging\\windows\\setup.wxs"] diff --git a/resources/packaging/linux/sniffnet.desktop b/resources/packaging/linux/sniffnet.desktop index e5216212..aa20a3ae 100644 --- a/resources/packaging/linux/sniffnet.desktop +++ b/resources/packaging/linux/sniffnet.desktop @@ -3,7 +3,7 @@ Version=1.0 Type=Application Name=Sniffnet Comment=Application to comfortably monitor your network traffic -Categories=Network; +Categories=Network;Utility; Icon=sniffnet Exec=/usr/bin/sniffnet StartupWMClass=sniffnet diff --git a/resources/packaging/macos/Info.plist b/resources/packaging/macos/Info.plist index d0066964..e7a4b7ee 100644 --- a/resources/packaging/macos/Info.plist +++ b/resources/packaging/macos/Info.plist @@ -13,6 +13,7 @@ CFBundleShortVersionString0.0.0 CFBundleVersionfffffff CSResourcesFileMapped + LSApplicationCategoryTypepublic.app-category.utilities LSRequiresCarbon NSHighResolutionCapable