v0.3 makefile

3 files changed, 17 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5a8d0f72eaae..dcc696eba597 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = aursh
 	pkgdesc = A simple AUR helper written in bash
-	pkgver = 0.2
+	pkgver = 0.3
 	pkgrel = 1
 	url = https://github.com/huboles/aursh
 	install = aursh.install
@@ -8,7 +8,9 @@ pkgbase = aursh
 	groups = aursh
 	license = GPL
 	depends = bash
-	source = aursh-0.2.tar.gz::https://github.com/huboles/aursh/releases/download/testing/aursh-0.2.tar.gz
-	sha256sums = f671611ba69d9e60dd729589b67a2342909a34af0abb64b42ce9f72801cbcf97
+	depends = git
+	depends = curl
+	source = aursh-0.3.tar.gz::https://github.com/huboles/aursh/releases/download/testing/aursh-0.3.tar.gz
+	sha256sums = dbc00e6088daca0e06d43d2645f128f83c1762944e47f313c3084eefdb23754d
 
 pkgname = aursh
diff --git a/PKGBUILD b/PKGBUILD
index 43827aee9d9b..e53d965dc759 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,18 @@
 # Maintainer: Huck Boles <huboles@protonmail.com>
 pkgname=aursh
-pkgver=0.2
+pkgver=0.3
 pkgrel=1
 pkgdesc="A simple AUR helper written in bash"
 arch=('any')
 url="https://github.com/huboles/aursh"
 license=('GPL')
 groups=('aursh')
-depends=('bash')
+depends=('bash' 'git' 'curl')
 source=("$pkgname-$pkgver.tar.gz::$url/releases/download/testing/$pkgname-$pkgver.tar.gz")
 install=aursh.install
 BUILDENV+=('!check')
 package() {
-	cd "$srcdir" || exit
-    install -Dm644 aursh.conf "$pkgdir/etc/$pkgname/aursh.conf"
-    install -Dm644 makepkg.conf "$pkgdir/etc/$pkgname/makepkg.conf"
-    install -Dm644 pacman.conf "$pkgdir/etc/$pkgname/pacman.conf"
-    install -Dm755 functions.sh "$pkgdir/usr/lib/$pkgname/functions.sh"
-    install -Dm755 aur.sh "$pkgdir/usr/bin/aursh"
+    cd "$pkgname-$pkgver" || exit
+    make install DESTDIR="$srcdir/" 
 }
-sha256sums=('f671611ba69d9e60dd729589b67a2342909a34af0abb64b42ce9f72801cbcf97')
+sha256sums=('dbc00e6088daca0e06d43d2645f128f83c1762944e47f313c3084eefdb23754d')
diff --git a/aursh.install b/aursh.install
index be2171abf59e..d7a4a8024312 100644
--- a/aursh.install
+++ b/aursh.install
@@ -1,23 +1,12 @@
-post-install() {
-    [[ ! -d $HOME/.aursh ]] && mkdir -p "$HOME"/.aursh/{.src,.pkg,.build}
-    if [[ ! -d $XDG_CONFIG_HOME/aursh ]]; then
-        mkdir  "$XDG_CONFIG_HOME"/aursh/{,logs}
-        for i in 'aursh.conf' 'makepkg.conf' 'pacman.conf'; do
-            [[ ! -f $XDG_CONFIG_HOME/aursh/$i ]] && cp "/etc/aursh/$i" "$XDG_CONFIG_HOME/aursh/$i"
-        done
-        printf '[aursh-%s]\nSigLevel = Optional\nServer = file:///%s\n' "$USER" "$HOME/.aursh/.pkg" >> "$XDG_CONFIG_HOME/aursh/pacman.conf"
-    fi
-}
-
-post-update() {
-    [[ ! -d $XDG_CONFIG_HOME/aursh ]] && mkdir -p "$XDG_CONFIG_HOME/aursh/logs"
-    for i in 'aursh.conf' 'makepkg.conf' 'pacman.conf'; do
-        [[ ! -f $XDG_CONFIG_HOME/aursh/$i ]] && cp "/etc/aursh/$i" "$XDG_CONFIG_HOME/aursh/$i"
-    done
-    [[ ! -d $HOME/.aursh ]] && mkdir -p $HOME/.aursh/{.src,.pkg,.build}
-}
+# making sure XDG is set properly
+XDG_CACHE_HOME=${XDG_CACHE_HOME:-$HOME/.cache}
+XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-$HOME/.config}
+XDG_STATE_HOME=${XDG_STATE_HOME:-$HOME/.local/state}
 
 post-remove() {
     [[ -d $XDG_CONFIG_HOME/aursh ]] && rm -rf "$XDG_CONFIG_HOME/aursh"
+    [[ -d $XDG_CACHE_HOME/aursh ]] && rm -rf "$XDG_CACHE_HOME/aursh"
     [[ -d $HOME/.aursh ]] && rm -rf "$HOME/.aursh"
+    [[ -d /etc/aursh ]] && rm -rf "/etc/aursh"
+    [[ -d /usr/lib/aursh ]] && rm -rf "/etc/aursh"
 }