From 426b82bf78c77cb0ad161c5f456e55950560b9de Mon Sep 17 00:00:00 2001
From: Eric Lay <lay.eric@gmail.com>
Date: Tue, 23 Jun 2020 14:58:21 -0500
Subject: [PATCH] work in progress

---
 fpf | 59 ++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 25 deletions(-)

diff --git a/fpf b/fpf
index 71936ad..97bfa15 100644
--- a/fpf
+++ b/fpf
@@ -16,33 +16,42 @@ Help() {
     echo
 }
 
+### Manjaro Repo
+
+Mrepos() {
+	echo "Setting things up..."
+	sort <(comm -23 <(pacman -Slq | sort) <(pacman -Qq | sort)) <(comm -12 <(pacman -Slq | sort) <(pacman -Qq | sort) | awk '{print $0" *"}') > /tmp/packages
+    cat /tmp/packages |fzf -e -m --preview 'cat <(pacman -Si {1}) <(pacman -Fl {1} | awk "{print \$2}")' --layout=reverse --prompt='Select packages to install (use TAB to toggle selection) > ' | xargs -ro sudo pacman -S
+}
+
+### AUR Repo
+
+Arepos() {
+	wget -P /tmp/aur/ https://aur.archlinux.org/packages.gz >/dev/null 2>&1 && gunzip -f /tmp/aur/packages.gz
+	echo "$(tail -n +2 /tmp/aur/packages)" > /tmp/aur/packages
+	sort <(comm -23 <(sort /tmp/aur/packages) <(pacman -Qq | sort)) <(comm -12 <(sort /tmp/aur/packages) <(pacman -Qq | sort) | awk '{print $0" *"}') > /tmp/aur_packages
+	cat /tmp/aur/packages | fzf -e -m --preview  'cat <(yay -Si {1}) <(yay -Fl {1} | awk "{print \$2}")' --layout=reverse --prompt='Select packages to install (use TAB to toggle selection) > ' | xargs -ro yay -S
+}
+
 ### MAIN
 
 #   Test for AUR option, if not run with pacman
 if [[ -z "$1" ]]; then
-	echo "Setting things up..."
-	sort <(comm -23 <(pacman -Slq | sort) <(pacman -Qq | sort)) <(comm -12 <(pacman -Slq | sort) <(pacman -Qq | sort) | awk '{print $0" *"}') > /tmp/packages
-    cat /tmp/packages |fzf -e -m --preview 'cat <(pacman -Si {1}) <(pacman -Fl {1} | awk "{print \$2}")' --layout=reverse --prompt='Select packages to install (use TAB to toggle selection) > ' | xargs -ro sudo pacman -S
+	Mrepos
+else
+	for opt in "$@"; do
+		case $opt in
+    		-y|--yay) #Get AUR package database, remove unwanted lines, preview database and hand off to yay for install
+       			echo -e "Syncing AUR package database..." 
+				Arepos
+       			;;
+    		-h|--help) #Usage // Help
+       			Help
+       			;;
+    		-*) #Error catching
+       			echo "Invalid Usage"
+       			Help
+       			;;
+    	esac
+	done
 fi
-
-while getopts ":yh" option; do
-    case $option in
-    y) #Get AUR package database, remove unwanted lines, preview database and hand off to yay for install
-       clear
-       echo -e "Syncing AUR package database..." 
-       wget -P /tmp/aur/ https://aur.archlinux.org/packages.gz >/dev/null 2>&1 && gunzip -f /tmp/aur/packages.gz
-       echo "$(tail -n +2 /tmp/aur/packages)" > /tmp/aur/packages
-       sort <(comm -23 <(sort /tmp/aur/packages) <(pacman -Qq | sort)) <(comm -12 <(sort /tmp/aur/packages) <(pacman -Qq | sort) | awk '{print $0" *"}') > /tmp/aur_packages
-       cat /tmp/aur_packages | fzf -e -m --preview  'cat <(yay -Si {1}) <(yay -Fl {1} | awk "{print \$2}")' --layout=reverse --prompt='Select packages to install (use TAB to toggle selection) > ' | xargs -ro yay -S
-       clear
-       ;;
-    h) #Usage // Help
-       Help
-       ;;
-    *) #Error catching
-       echo "Invalid Usage"
-       sleep 2
-       Help
-       ;;
-    esac
-done