Tings

1 files changed, 24 insertions, 16 deletions

diff --git a/aur b/aur
index 8511777..8e4c42f 100755
--- a/aur
+++ b/aur
@@ -1,29 +1,37 @@
 #!/usr/bin/env sh
+
+url="https://aur.archlinux.org"
+dir="$HOME/prog/aur"
+
+sep() { tr '{' '\n' | grep Name; }
+fmt() { cut -d, -f 2,5,6 | sed 's/"Name":"//;s/","Version":"/ /;s/","Description":"/\n\t/;s/"$//'; }
+
 if [ "$1" = "-s" ]; then
   shift
   echo Searching for "$*" ...
   var="$(echo $* | sed 's/\ /%20/g')"
-  echo -e "$(wget -q "https://aur.archlinux.org/rpc.php?type=search&arg=$var" -O - | tr '{' '\n ' | grep Name | sed 's/.*"Name":"\(.*\)",.*,"Version":"\(.*\)",.*,"Description":"\(.*\)","URL".*/\1 \2\n \3\n/')"
+  wget -q "$url/rpc.php?type=search&arg=$var" -O - | sep | fmt
   exit
 fi;
   
-cd ~/prog/aur
+cd $dir
+if [ -d "$1" ]; then
+    echo Pulling ...
+    cd $1
+    git pull
+else
+    echo Updating ...
+    git clone "$url/$1.git"
+    cd $1
+fi;
 
-echo Pulling...
-wget "https://aur.archlinux.org/packages/`echo $1|cut -b 1-2`/$1/$1.tar.gz"
-if [ -f "$1.tar.gz" ]; then
-  echo Extracting...
-  tar -xf "$1.tar.gz"
-  cd "$1"
-  mv ../"$1.tar.gz" .
-  echo -n Edit\?\ 
-  read edit
-  [ "$edit" = "y" ] && $EDITOR PKGBUILD
-  echo Building...
-  makepkg -f
-  if [ "$?" = "0" ]; then 
+echo -ne "Edit PKGBUILD? "
+read edit
+[ "$edit" = "y" ] && $EDITOR PKGBUILD
+echo Building...
+makepkg -f
+if [ "$?" = "0" ]; then 
     name=$1"-`sed -n 's/pkgver=//p' PKGBUILD`-`sed -n 's/pkgrel=//p' PKGBUILD`"
     echo Installing...
     sudo pacman -U $name*.xz
-  fi
 fi