diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 47 | ||||
| -rw-r--r-- | eddie-ui.install | 30 |
3 files changed, 56 insertions, 27 deletions
@@ -1,9 +1,9 @@ pkgbase = eddie-ui-git - pkgdesc = Eddie - OpenVPN UI - beta version - pkgver = 2.17.2 + pkgdesc = Eddie - VPN tunnel - beta version + pkgver = 2.18.7 pkgrel = 1 url = https://eddie.website - install = eddie-ui-git.install + install = eddie-ui.install arch = i686 arch = x86_64 license = GPLv3 @@ -1,13 +1,12 @@ # Maintainer: Eddie.website <maintainer@eddie.website> # Based on work by Uncle Hunto <unclehunto äτ ÝãΗ00 Ð0τ ÇÖΜ> and Beini <bane aτ iki dot fi> -# This PKGUILD it's based on the latest GitHub commit. # Pending work: man & changelog files generated automatically. pkgname=eddie-ui-git -pkgver=2.17.2 +pkgver=2.18.7 pkgrel=1 -pkgdesc='Eddie - OpenVPN UI - beta version' +pkgdesc='Eddie - VPN tunnel - beta version' arch=('i686' 'x86_64') url=https://eddie.website license=(GPLv3) @@ -16,7 +15,7 @@ optdepends=('stunnel: VPN over SSL' 'openssh: VPN over SSH') makedepends=('cmake') provides=('eddie-ui') conflicts=('airvpn' 'airvpn-beta-bin' 'airvpn-git') -install=eddie-ui-git.install +install=eddie-ui.install source=('git+https://github.com/AirVPN/Eddie.git') sha1sums=('SKIP') @@ -31,7 +30,8 @@ build() { export TERM=xterm # Fix Mono bug "Magic number is wrong". # Compile C# sources - cd "Eddie" + #cd "Eddie" # pazzo, revert + cd "eddie-air" xbuild /verbosity:minimal /p:Configuration="Release" /p:Platform="$_pkgarch" src/eddie2.linux.sln # Compile C sources (Tray) @@ -41,36 +41,35 @@ build() { strip -S --strip-unneeded -o eddie-tray-strip eddie_tray cd ../.. - # Compile C sources (Linux Native) - cd src/Lib.Platform.Linux.Native - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=. - make - strip -S --strip-unneeded -o libLib.Platform.Linux.Native.strip.so libLib.Platform.Linux.Native.so - cd ../.. + # Compile C sources + src/eddie.linux.postbuild.sh "src/App.Forms.Linux/bin/$_pkgarch/Release/" ui $_pkgarch Release } package() { - cd "Eddie" - install -Dm755 "src/App.Forms.Linux/bin/$_pkgarch/Release/App.Forms.Linux.exe" "$pkgdir/usr/lib/eddie-ui/Eddie-UI.exe" - install -Dm644 "src/App.Forms.Linux/bin/$_pkgarch/Release/Lib.Common.dll" "$pkgdir/usr/lib/eddie-ui/Lib.Common.dll" + cd * # First folder + install -Dm755 "src/App.Forms.Linux/bin/$_pkgarch/Release/App.Forms.Linux.exe" "$pkgdir/usr/lib/eddie-ui/eddie-ui.exe" + install -Dm755 "src/App.Forms.Linux/bin/$_pkgarch/Release/eddie-cli-elevated" "$pkgdir/usr/lib/eddie-ui/eddie-cli-elevated" install -Dm644 "src/App.Forms.Linux/bin/$_pkgarch/Release/Lib.Core.dll" "$pkgdir/usr/lib/eddie-ui/Lib.Core.dll" install -Dm644 "src/App.Forms.Linux/bin/$_pkgarch/Release/Lib.Forms.dll" "$pkgdir/usr/lib/eddie-ui/Lib.Forms.dll" install -Dm644 "src/App.Forms.Linux/bin/$_pkgarch/Release/Lib.Platform.Linux.dll" "$pkgdir/usr/lib/eddie-ui/Lib.Platform.Linux.dll" - install -Dm644 "src/Lib.Platform.Linux.Native/libLib.Platform.Linux.Native.strip.so" "$pkgdir/usr/lib/eddie-ui/libLib.Platform.Linux.Native.so" + install -Dm644 "src/Lib.Platform.Linux.Native/bin/libLib.Platform.Linux.Native.so" "$pkgdir/usr/lib/eddie-ui/libLib.Platform.Linux.Native.so" install -Dm755 "src/UI.GTK.Linux.Tray/eddie-tray-strip" "$pkgdir/usr/lib/eddie-ui/eddie-tray" - install -Dm755 "deploy/linux_$_pkgarch/update-resolv-conf" "$pkgdir/usr/lib/eddie-ui/update-resolv-conf" - install -Dm755 "resources/debian/usr/bin/eddie-ui" "$pkgdir/usr/bin/eddie-ui" + install -Dm755 "repository/linux_arch/bundle/eddie-ui/usr/bin/eddie-ui" "$pkgdir/usr/bin/eddie-ui" + sed -i 's/{@lib}/lib/g' "$pkgdir/usr/bin/eddie-ui" install -Dm644 "common/cacert.pem" "$pkgdir/usr/share/eddie-ui/cacert.pem" install -Dm644 "common/icon.png" "$pkgdir/usr/share/eddie-ui/icon.png" install -Dm644 "common/icon_gray.png" "$pkgdir/usr/share/eddie-ui/icon_gray.png" install -Dm644 "common/icon.png" "$pkgdir/usr/share/eddie-ui/tray.png" install -Dm644 "common/icon_gray.png" "$pkgdir/usr/share/eddie-ui/tray_gray.png" install -Dm644 "common/iso-3166.json" "$pkgdir/usr/share/eddie-ui/iso-3166.json" - # install -Dm644 "resources/arch/usr/share/doc/eddie-ui/changelog.Debian.gz" "$pkgdir/usr/share/doc/eddie-ui/changelog.gz" # TOFIX: Missing changelog generation - install -Dm644 "resources/arch/usr/share/doc/eddie-ui/copyright" "$pkgdir/usr/share/doc/eddie-ui/copyright" - # install -Dm644 "resources/arch/usr/share/man/man8/eddie-ui.8.gz" "$pkgdir/usr/share/man/man1/eddie-ui.8.gz" # TOFIX: Missing man generation - install -Dm644 "resources/arch/usr/share/polkit-1/actions/org.airvpn.eddie.ui.policy" "$pkgdir/usr/share/polkit-1/actions/org.airvpn.eddie.ui.policy" - install -Dm644 "resources/arch/usr/share/pixmaps/eddie-ui.png" "$pkgdir/usr/share/pixmaps/eddie-ui.png" + install -Dm644 "common/lang/inv.json" "$pkgdir/usr/share/eddie-ui/lang/inv.json" + # cp -r "common/webui" "$pkgdir/usr/share/eddie-ui/webui" + # install -Dm644 "repository/linux_arch/bundle/eddie-ui/usr/share/doc/eddie-ui/changelog.Debian.gz" "$pkgdir/usr/share/doc/eddie-ui/changelog.gz" # TOFIX: Missing changelog generation + install -Dm644 "repository/linux_arch/bundle/eddie-ui/usr/share/doc/eddie-ui/copyright" "$pkgdir/usr/share/doc/eddie-ui/copyright" + # install -Dm644 "repository/linux_arch/bundle/eddie-ui/usr/share/man/man8/eddie-ui.8.gz" "$pkgdir/usr/share/man/man1/eddie-ui.8.gz" # TOFIX: Missing man generation + install -Dm644 "repository/linux_arch/bundle/eddie-ui/usr/share/polkit-1/actions/org.airvpn.eddie.ui.elevated.policy" "$pkgdir/usr/share/polkit-1/actions/org.airvpn.eddie.ui.elevated.policy" + sed -i 's/{@lib}/lib/g' "$pkgdir/usr/share/polkit-1/actions/org.airvpn.eddie.ui.elevated.policy" + install -Dm644 "repository/linux_arch/bundle/eddie-ui/usr/share/pixmaps/eddie-ui.png" "$pkgdir/usr/share/pixmaps/eddie-ui.png" ## Fix .desktop file for KDE _desktop_session=$(printf "%s" "$DESKTOP_SESSION" | awk -F "/" '{print $NF}') @@ -79,12 +78,12 @@ package() { desktop-file-install -m 644 --set-comment="OpenVPN UI" \ --dir="$pkgdir/usr/share/applications/" \ --set-icon="/usr/share/pixmaps/eddie-ui.png" \ - "resources/opensuse/usr/share/applications/eddie-ui.desktop" + "repository/linux_arch/bundle/eddie-ui/usr/share/applications/eddie-ui.desktop" else msg2 "Installing desktop file..." desktop-file-install -m 644 --set-comment="OpenVPN UI" \ --dir="$pkgdir/usr/share/applications/" \ - "resources/opensuse/usr/share/applications/eddie-ui.desktop" + "repository/linux_arch/bundle/eddie-ui/usr/share/applications/eddie-ui.desktop" fi } diff --git a/eddie-ui.install b/eddie-ui.install new file mode 100644 index 000000000000..2a4b46bb2950 --- /dev/null +++ b/eddie-ui.install @@ -0,0 +1,30 @@ +# Colored makepkg-like functions +msg_blue() { + printf "${blue}==>${bold} $1${all_off}\n" +} + +note() { + printf "${blue}==>${yellow} NOTE:${bold} $1${all_off}\n" +} + +all_off="$(tput sgr0)" +bold="${all_off}$(tput bold)" +blue="${bold}$(tput setaf 4)" +yellow="${bold}$(tput setaf 3)" + +_update() { + msg_blue "Updating desktop MIME database..." + update-desktop-database -q +} + +post_install() { + _update +} + +post_upgrade() { + post_install +} + +post_remove() { + _update +} |