diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 23 | ||||
| -rw-r--r-- | skypeforlinux-stable-bin-install (renamed from install.sh) | 6 |
3 files changed, 19 insertions, 20 deletions
@@ -1,9 +1,9 @@ pkgbase = skypeforlinux-stable-bin pkgdesc = Skype for Linux - Stable/Release Version - pkgver = 8.87.0.406 + pkgver = 8.109.0.209 pkgrel = 1 url = http://www.skype.com - install = install.sh + install = skypeforlinux-stable-bin-install arch = x86_64 license = custom depends = gtk3 @@ -18,11 +18,9 @@ pkgbase = skypeforlinux-stable-bin provides = skypeforlinux provides = skype conflicts = skypeforlinux - conflicts = skypeforlinux-bin conflicts = skypeforlinux-preview-bin - conflicts = skypeforlinux-beta-bin conflicts = skype - source = https://repo.skype.com/rpm/stable/skypeforlinux_8.87.0.406-1.x86_64.rpm - sha256sums = 31ef8d78d729b1acf4897126454f79e8aa55a8b274643aa3d9114bb24639a814 + source = skypeforlinux_8.109.0.209_1_amd64.deb::https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_8.109.0.209_amd64.deb + sha256sums = 3e66c37bc63b9767f80762c6e9e9377789247d97603395f72ee6e2b8a437e0fb pkgname = skypeforlinux-stable-bin @@ -2,8 +2,8 @@ # Original Maintainer: Jameson Pugh <imntreal@gmail.com> _pkgname=skypeforlinux -pkgname=$_pkgname-stable-bin -pkgver=8.87.0.406 +pkgname="$_pkgname-stable-bin" +pkgver=8.109.0.209 pkgrel=1 pkgdesc="Skype for Linux - Stable/Release Version" arch=("x86_64") @@ -13,22 +13,23 @@ depends=("gtk3" "libxss" "alsa-lib" "libxtst" "libsecret" "nss" "glibc>=2.28-4") optdepends=("org.freedesktop.secrets: keyring/password support" "libappindicator-gtk3: systray icon support") -conflicts=("$_pkgname" "$_pkgname-bin" "$_pkgname-preview-bin" - "$_pkgname-beta-bin" "skype") +conflicts=("$_pkgname" "$_pkgname-preview-bin" "skype") provides=("$_pkgname" "skype") -install=install.sh +install="$pkgname-install" +# We embed the pkgrel in the download file name because skype devs +# sometimes use the same version number for an update and any previously +# cached file will otherwise fail against the new checksum. source=( -"https://repo.skype.com/rpm/stable/${_pkgname}_${pkgver}-1.x86_64.rpm" +"${_pkgname}_${pkgver}_${pkgrel}_amd64.deb::https://repo.skype.com/deb/pool/main/s/$_pkgname/${_pkgname}_${pkgver}_amd64.deb" ) -sha256sums=('31ef8d78d729b1acf4897126454f79e8aa55a8b274643aa3d9114bb24639a814') +sha256sums=('3e66c37bc63b9767f80762c6e9e9377789247d97603395f72ee6e2b8a437e0fb') package() { - cd $pkgdir - bsdtar -xf $srcdir/${_pkgname}_${pkgver}-1.x86_64.rpm - rm -rf "$pkgdir/usr/lib/.build-id" + tar --no-same-owner -xC "$pkgdir" -f data.tar.gz install -d "$pkgdir/usr/share/licenses/$pkgname" mv "$pkgdir/usr/share/$_pkgname/LICENSES.chromium.html" \ - "$pkgdir/usr/share/licenses/$pkgname/" + "$pkgdir/usr/share/licenses/$pkgname/" + rm -rf "$pkgdir/opt" } # vim:set ts=2 sw=2 et: diff --git a/install.sh b/skypeforlinux-stable-bin-install index 4d02183d6b3b..6ed926f1f68d 100644 --- a/install.sh +++ b/skypeforlinux-stable-bin-install @@ -3,15 +3,15 @@ _userns="kernel.unprivileged_userns_clone" post_install() { userns="$(sysctl -n $_userns 2>/dev/null)" - if [[ $? -ne 0 || $userns -ne 1 ]]; then - echo -e "\e[34;1m" + if [[ $? -eq 0 && $userns -ne 1 ]]; then + echo -ne "\e[34;1m" echo === echo === !!! WARNING !!! echo === echo === $_userns is not set on this system. echo === You will need to set it manually so $_pkgname can start. echo === - echo -e "\033[0m" + echo -ne "\033[0m" fi } |