diff --git a/packer/alpine-linux/files/ostinato/3.12/ostinato-1.1-r0.apk b/packer/alpine-linux/files/ostinato/3.12/ostinato-1.1-r0.apk deleted file mode 100644 index 1a55d1a..0000000 Binary files a/packer/alpine-linux/files/ostinato/3.12/ostinato-1.1-r0.apk and /dev/null differ diff --git a/packer/alpine-linux/files/ostinato/3.12/ostinato-1.1-r1.apk b/packer/alpine-linux/files/ostinato/3.12/ostinato-1.1-r1.apk new file mode 100644 index 0000000..5df3a01 Binary files /dev/null and b/packer/alpine-linux/files/ostinato/3.12/ostinato-1.1-r1.apk differ diff --git a/packer/alpine-linux/files/ostinato/3.12/ostinato-drone-1.1-r0.apk b/packer/alpine-linux/files/ostinato/3.12/ostinato-drone-1.1-r0.apk deleted file mode 100644 index 4d80557..0000000 Binary files a/packer/alpine-linux/files/ostinato/3.12/ostinato-drone-1.1-r0.apk and /dev/null differ diff --git a/packer/alpine-linux/files/ostinato/3.12/ostinato-drone-1.1-r1.apk b/packer/alpine-linux/files/ostinato/3.12/ostinato-drone-1.1-r1.apk new file mode 100644 index 0000000..a54c2f6 Binary files /dev/null and b/packer/alpine-linux/files/ostinato/3.12/ostinato-drone-1.1-r1.apk differ diff --git a/packer/alpine-linux/files/ostinato/3.12/ostinato-gui-1.1-r0.apk b/packer/alpine-linux/files/ostinato/3.12/ostinato-gui-1.1-r0.apk deleted file mode 100644 index ae339c4..0000000 Binary files a/packer/alpine-linux/files/ostinato/3.12/ostinato-gui-1.1-r0.apk and /dev/null differ diff --git a/packer/alpine-linux/files/ostinato/3.12/ostinato-gui-1.1-r1.apk b/packer/alpine-linux/files/ostinato/3.12/ostinato-gui-1.1-r1.apk new file mode 100644 index 0000000..ec6a440 Binary files /dev/null and b/packer/alpine-linux/files/ostinato/3.12/ostinato-gui-1.1-r1.apk differ diff --git a/packer/alpine-linux/files/ostinato/build-package b/packer/alpine-linux/files/ostinato/build-package index 59ff4eb..86f9bad 100755 --- a/packer/alpine-linux/files/ostinato/build-package +++ b/packer/alpine-linux/files/ostinato/build-package @@ -15,6 +15,6 @@ cd aports/*/ostinato abuild -F -r cd -find packages -name "*.apk" -type f -exec cp -p {} /package \; +cp -p packages/*/*/*.apk /package chown $(stat -c '%u:%g' /package) /package/* EOF diff --git a/packer/alpine-linux/scripts/ostinato.sh b/packer/alpine-linux/scripts/ostinato.sh index 6793cf4..7ef77e6 100644 --- a/packer/alpine-linux/scripts/ostinato.sh +++ b/packer/alpine-linux/scripts/ostinato.sh @@ -10,10 +10,12 @@ apk add tshark wireshark # desktop integration cat > /usr/share/applications/ostinato.desktop << 'EOF' [Desktop Entry] -Type=Application Name=Ostinato +GenericName=Packet Traffic Generator +Exec=ostinato Icon=ostinato -Exec=sh -c 'ostinato > /tmp/ostinato.log 2>&1' +Terminal=false +Type=Application Categories=Network;Monitor;Qt; EOF cp -p /tmp/uploads/ostinato/logo_256x256.png /usr/share/icons/hicolor/256x256/apps/ostinato.png