V2 should be working correctly now

3 files changed, 47 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f5c336edd904..81e3787ca839 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = fakeaur
 	pkgdesc = Edit names and descriptions of AUR packages. Meme mates with nani or btwiusearch
-	pkgver = r5.b8f4cf3
+	pkgver = r7.9f23531
 	pkgrel = 2
 	url = https://github.com/schrmh/fakeAUR
 	arch = any
diff --git a/PKGBUILD b/PKGBUILD
index 325995278bfa..ce2d44d7ae49 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Hans Müller <schreibemirhalt@gmail.com>
 pkgname=fakeaur
-pkgver=r5.b8f4cf3
+pkgver=r7.9f23531
 pkgrel=2
 pkgdesc="Edit names and descriptions of AUR packages. Meme mates with nani or btwiusearch"
 arch=('any')
diff --git a/fakeAUR.sh b/fakeAUR.sh
index 11225c67b995..bb78aa0b3782 100755
--- a/fakeAUR.sh
+++ b/fakeAUR.sh
@@ -13,7 +13,7 @@ function show_help () {
     echo "3) Copy a screnshoot to clipboard"
     echo "4) Fix formatted output for trizen.."
     echo "5) A config file that allows custom shortcuts that are like -btw or -nani"
-    echo "DEBUG2"
+    echo "Try -debug if something is wrong with the output"
 }
 if [ $# -eq 0 ] 
 then
@@ -41,80 +41,72 @@ for i in "$@"
                 echo $pac
                 echo concat end
                 
-                if [[ $pac = *"00"* ]]; then
-                    delete=$(echo $pac | grep -oP "(?<=$USER\s)\w+")
-                    pac=$(echo $pac | grep -o -P '(?<=00:00:00).*(?=)')
-                    echo lol
-                    echo $pac
-                    echo rid off me
-                    echo $delete
-                    echo now
-                    kill -9 $delete
-                fi
-                echo $pac
+               # if [[ $pac = *"00"* ]]; then
+               #     delete=$(echo $pac | grep -oP "(?<=$USER\s)\w+")
+               #     pac=$(echo $pac | grep -o -P '(?<=00:00:00).*(?=)')
+               #     echo lol
+               #     echo $pac
+               #     echo rid off me
+               #     echo $delete
+               #     echo now
+               #     kill -9 $delete
+               # fi
+               # echo $pac
             
-                description=$(echo -ne '\n' | eval "${pac:1}" | grep "    ")
-                name=$(echo ${pac:1} | grep -Eo "[^ ]+$")
-                helper=$(echo ${pac:1} | grep -o '^\S*')
+                description=$(echo -ne '\n' | eval "${pac}" | grep "    ")
+                name=$(echo ${pac} | grep -Eo "[^ ]+$")
+                helper=$(echo ${pac} | grep -o '^\S*')
                 echo ${PS1@P}$helper btwiusearch
-                echo -ne '\n' | eval ${pac:1} | sed -e "s/$name/btwiusearch/" | sed -e "s/$description/A very important and easy to use package to show the world that you run the best distro/"
+                echo -ne '\n' | eval ${pac} | sed -e "s/$name/btwiusearch/" | sed -e "s/$description/A very important and easy to use package to show the world that you run the best distro/"
             ;;
             -btw )
                 processes=$(> >(ps -f))
-                pac=$(echo $processes | grep -o -P '(?<=CM).*(?=fakeAUR)' | grep -o -P '(?<=D).*(?=fakeAUR)' | grep -o -P "(?<=00:00:00).*(?=$USER)")
-                if [[ $pac = *"00"* ]]; then
-                    delete=$(echo $pac | grep -oP "(?<=$USER\s)\w+")
-                    pac=$(echo $pac | grep -o -P '(?<=00:00:00).*(?=)')
-                    kill -9 $delete
-                fi
+                pac=$(echo $processes | grep -o -P "(?<=00:00:00).*(?=$USER)" | grep -o -P "(?<=00:00:00).*(?=00:00:00)")
+                one=$(echo $pac | cut -d' ' -f1)
+                two=$(echo $pac | cut -d' ' -f2)
+                pac=$one" "$two
             
-                description=$(echo -ne '\n' | eval "${pac:1}" | grep "    ")
-                name=$(echo ${pac:1} | grep -Eo "[^ ]+$")
-                helper=$(echo ${pac:1} | grep -o '^\S*')
+                description=$(echo -ne '\n' | eval "${pac}" | grep "    ")
+                name=$(echo ${pac} | grep -Eo "[^ ]+$")
+                helper=$(echo ${pac} | grep -o '^\S*')
                 echo ${PS1@P}$helper btwiusearch
-                echo -ne '\n' | eval ${pac:1} | sed -e "s/$name/btwiusearch/" | sed -e "s/$description/A very important and easy to use package to show the world that you run the best distro/"
+                echo -ne '\n' | eval ${pac} | sed -e "s/$name/btwiusearch/" | sed -e "s/$description/A very important and easy to use package to show the world that you run the best distro/"
             ;;
             -nani )
                 processes=$(> >(ps -f))
-                pac=$(echo $processes | grep -o -P '(?<=CM).*(?=fakeAUR)' | grep -o -P '(?<=D).*(?=fakeAUR)' | grep -o -P "(?<=00:00:00).*(?=$USER)")
-                if [[ $pac = *"00"* ]]; then
-                    delete=$(echo $pac | grep -oP "(?<=$USER\s)\w+")
-                    pac=$(echo $pac | grep -o -P '(?<=00:00:00).*(?=)')
-                    kill -9 $delete
-                fi
+                pac=$(echo $processes | grep -o -P "(?<=00:00:00).*(?=$USER)" | grep -o -P "(?<=00:00:00).*(?=00:00:00)")
+                one=$(echo $pac | cut -d' ' -f1)
+                two=$(echo $pac | cut -d' ' -f2)
+                pac=$one" "$two
             
-                description=$(echo -ne '\n' | eval "${pac:1}" | grep "    ")
-                name=$(echo ${pac:1} | grep -Eo "[^ ]+$")
-                helper=$(echo ${pac:1} | grep -o '^\S*')
+                description=$(echo -ne '\n' | eval "${pac}" | grep "    ")
+                name=$(echo ${pac} | grep -Eo "[^ ]+$")
+                helper=$(echo ${pac} | grep -o '^\S*')
                 echo ${PS1@P}$helper nani
-                echo -ne '\n' | eval ${pac:1} | sed -e "s/$name/nani/" | sed -e "s/$description/now you can speak japanese/"
+                echo -ne '\n' | eval ${pac} | sed -e "s/$name/nani/" | sed -e "s/$description/now you can speak japanese/"
             ;;
             -grep)
                 processes=$(> >(ps -f))
-                pac=$(echo $processes | grep -o -P '(?<=CM).*(?=fakeAUR)' | grep -o -P '(?<=D).*(?=fakeAUR)' | grep -o -P "(?<=00:00:00).*(?=$USER)")
-                if [[ $pac = *"00"* ]]; then
-                    delete=$(echo $pac | grep -oP "(?<=$USER\s)\w+")
-                    pac=$(echo $pac | grep -o -P '(?<=00:00:00).*(?=)')
-                    kill -9 $delete
-                fi
+                pac=$(echo $processes | grep -o -P "(?<=00:00:00).*(?=$USER)" | grep -o -P "(?<=00:00:00).*(?=00:00:00)")
+                one=$(echo $pac | cut -d' ' -f1)
+                two=$(echo $pac | cut -d' ' -f2)
+                pac=$one" "$two
             
-                description=$(echo -ne '\n' | eval "${pac:1}" | grep "    ")
+                description=$(echo -ne '\n' | eval "${pac}" | grep "    ")
                 echo $description
             ;;
             *)
                 processes=$(> >(ps -f))
-                pac=$(echo $processes | grep -o -P '(?<=CM).*(?=fakeAUR)' | grep -o -P '(?<=D).*(?=fakeAUR)' | grep -o -P "(?<=00:00:00).*(?=$USER)")
-                if [[ $pac = *"00"* ]]; then
-                    delete=$(echo $pac | grep -oP "(?<=$USER\s)\w+")
-                    pac=$(echo $pac | grep -o -P '(?<=00:00:00).*(?=)')
-                    kill -9 $delete
-                fi
+                pac=$(echo $processes | grep -o -P "(?<=00:00:00).*(?=$USER)" | grep -o -P "(?<=00:00:00).*(?=00:00:00)")
+                one=$(echo $pac | cut -d' ' -f1)
+                two=$(echo $pac | cut -d' ' -f2)
+                pac=$one" "$two
             
-                description=$(echo -ne '\n' | eval "${pac:1}" | grep "    ")
-                name=$(echo ${pac:1} | grep -Eo "[^ ]+$")
-                helper=$(echo ${pac:1} | grep -o '^\S*')
+                description=$(echo -ne '\n' | eval "${pac}" | grep "    ")
+                name=$(echo ${pac} | grep -Eo "[^ ]+$")
+                helper=$(echo ${pac} | grep -o '^\S*')
                 echo ${PS1@P}$helper $1
-                echo -ne '\n' | eval ${pac:1} | sed -e "s/$name/$1/" | sed -e "s/$description/$2/"
+                echo -ne '\n' | eval ${pac} | sed -e "s/$name/$1/" | sed -e "s/$description/$2/"
             ;;
         esac
     done