Commit 9a4ee35d authored by Strit's avatar Strit

updated to latest git, 7.3.5-4

parent bced137d
......@@ -4,10 +4,10 @@ pkgbase=pamac
pkgname=('pamac-common' 'pamac-cli' 'pamac-gtk' 'pamac-tray-appindicator')
_pkgver=7.3.5
pkgver=7.3.5
pkgrel=2
_commit=
pkgrel=4
_commit=31b21c8934365a07aee06679f1e47e7f02f6570e
pkgdesc="A Package Manager based on libalpm with AUR and Appstream support"
arch=('i686' 'x86_64' 'armv7h' 'aarch64')
arch=('i686' 'x86_64' 'aarch64')
url="https://gitlab.manjaro.org/applications/pamac"
license=('GPL3')
depends=('glib2>=2.42' 'json-glib' 'libsoup' 'dbus-glib' 'polkit' 'vte3>=0.38' 'gtk3>=3.22'
......@@ -16,12 +16,12 @@ depends=('glib2>=2.42' 'json-glib' 'libsoup' 'dbus-glib' 'polkit' 'vte3>=0.38' '
makedepends=('gettext' 'meson' 'vala>=0.36.6' 'libappindicator-gtk3' 'gobject-introspection')
options=(!emptydirs)
source=("pamac-$pkgver-$pkgrel.tar.gz::$url/-/archive/v$pkgver/pamac-v$pkgver.tar.gz")
#"pamac-$pkgver-$pkgrel.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz")
sha256sums=('7fcb99133bf6490726e7c878ef3e465b4d098a62ca8e368a6ae64d8d4004ddf9')
source=( #"pamac-$pkgver-$pkgrel.tar.gz::$url/-/archive/v$pkgver/pamac-v$pkgver.tar.gz")
"pamac-$pkgver-$pkgrel.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz")
sha256sums=('ce023b7ddaad13e90fcd3b016bdd2a5e5b7f433c96587d61bab87709bca4a639')
prepare() {
#mv "$srcdir/pamac-$_commit" "$srcdir/pamac-v$_pkgver"
mv "$srcdir/pamac-$_commit" "$srcdir/pamac-v$_pkgver"
cd "$srcdir/pamac-v$_pkgver"
# patches here
......@@ -42,7 +42,7 @@ build() {
package_pamac-common() {
depends=('glib2>=2.42' 'json-glib' 'libsoup' 'dbus-glib' 'polkit'
'libnotify' 'desktop-file-utils' 'pacman>=5.1' 'pacman<5.2' 'gnutls>=3.4'
'appstream-glib' 'archlinux-appstream-data' 'pacman-mirrorlist' 'git')
'appstream-glib' 'archlinux-appstream-data' 'pacman-mirrors>=4.9.1' 'git')
backup=('etc/pamac.conf')
conflicts=('pamac<=7.3.4-2' 'pamac-aur')
install=pamac-common.install
......
msg() {
ALL_OFF="\e[1;0m"
BOLD="\e[1;1m"
GREEN="${BOLD}\e[1;32m"
local mesg=$1; shift
printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
}
restore_conf() {
PAMAC_NEW="$(date +%m%d%M%S)"
if [ -f "/etc/pamac.conf.pacsave" ]; then
msg "You had an old /etc/pamac.conf.pacsave file. We restore it for you."
msg "You can find your new pamac.conf saved as \`/etc/pamac-new-${PAMAC_NEW}.conf\`"
mv /etc/pamac.conf /etc/pamac-new-${PAMAC_NEW}.conf
mv /etc/pamac.conf.pacsave /etc/pamac.conf
fi
}
post_install() {
# enable systemd timers
ln -sf /usr/lib/systemd/system/pamac-cleancache.timer /etc/systemd/system/multi-user.target.wants/
......@@ -8,6 +26,15 @@ post_install() {
printf ' have an authentication agent already.\n'
printf ' See https://wiki.archlinux.org/index.php/Polkit#Authentication_agents\n'
printf ' for other desktop environments.\n'
# restore old conf
restore_conf
}
post_upgrade() {
# restore old conf
if [ "$(vercmp $2 7.3.5-3)" -lt 0 ]; then
restore_conf
fi
}
post_remove() {
......@@ -15,4 +42,3 @@ post_remove() {
rm -f /etc/systemd/system/multi-user.target.wants/pamac-cleancache.timer
rm -f /etc/systemd/system/multi-user.target.wants/pamac-mirrorlist.timer
}
msg() {
ALL_OFF="\e[1;0m"
BOLD="\e[1;1m"
GREEN="${BOLD}\e[1;32m"
local mesg=$1; shift
printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
}
post_install() {
# restore old conf
PAMAC_NEW="$(date +%m%d%M%S)"
if [ "$(vercmp $2 7.3.5-1)" -lt 0 ]; then
if [ -f "/etc/pamac.conf.pacsave" ]; then
msg "You had an old /etc/pamac.conf.pacsave file. We restore it for you."
msg "You can find your new pamac.conf saved as \`/etc/pamac-new-${PAMAC_NEW}.conf\`"
mv /etc/pamac.conf /etc/pamac-new-${PAMAC_NEW}.conf
mv /etc/pamac.conf.pacsave /etc/pamac.conf
fi
fi
# enable pamac extension
printf '==> Enable Pamac Updates Indicator via\n'
printf ' Gnome Tweak\n'
}
post_upgrade() {
# restore old conf
PAMAC_NEW="$(date +%m%d%M%S)"
if [ "$(vercmp $2 7.3.5-1)" -lt 0 ]; then
if [ -f "/etc/pamac.conf.pacsave" ]; then
msg "You had an old /etc/pamac.conf.pacsave file. We restore it for you."
msg "You can find your new pamac.conf saved as \`/etc/pamac-new-${PAMAC_NEW}.conf\`"
mv /etc/pamac.conf /etc/pamac-new-${PAMAC_NEW}.conf
mv /etc/pamac.conf.pacsave /etc/pamac.conf
fi
fi
if [[ ! "gsettings get org.gnome.shell enabled-extensions | grep 'pamac-updates'" ]]; then
# enable pamac extension
printf '==> Enable Pamac Updates Indicator via\n'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment