Show versions in AUR searches, less jshon calls, read -r

README.md

@@ -7,6 +7,11 @@ A very simple AUR/ABS helper. Doesn't build packages, only gets the sources.
 	Flags:
 	        -h        Show this message.
 	        -s        Search for <package>.
+		      -S      Search only in the sync db. Implies -s.
+			  -A      Search only in AUR. Implies -s.
 	        -d        Get the package sources (default).
+		      -D      Get the dependencies also. Implies -d.
 
 You can override any value in the script in \$HOME/.config/zpac.rc.sh
+By default zpac downloads the sources into the current directory. Controlled by `$cfg_workdir`.
+

zpac

@@ -18,8 +18,10 @@ usage() {
 		Flags:
 		        -h        Show this message.
 		        -s        Search for <package>.
+		          -S        Search only in the sync db. Implies -s.
+		          -A        Search only in AUR. Implies -s.
 		        -d        Get the package sources (default).
-				-D        If used with -d, makes $_self download the dependencies from AUR too.
+				            Set twice to also get the dependencies.
 	EOF
 }
 
@@ -33,7 +35,14 @@ aur.search() {
 		aur_search_results=( $( jshon -e results -a -e Name -u <<< "$aur_api_search_data" ) )
 
 		for i in "${!aur_search_results[@]}"; do
-			printf 'aur/%s\n    %s\n' "${aur_search_results[${i}]}" "$( jshon -e results -e $i -e Description -u <<< "$aur_api_search_data" )"
+			{
+				read -r version
+				read -r description
+			} < <(
+				jshon -e results -e $i -e Version -u -p -e Description -u <<< "$aur_api_search_data"
+			)
+
+			printf '%s %s\n    %s\n' "aur/${aur_search_results[$i]}" "$version" "$description"
 		done
 	else
 		return 1
@@ -54,10 +63,14 @@ aur.info() {
 aur.get() {
 	local dep_name aur_api_multireq aur_deps_api_data aur_deps_count aur_deps pkg_aur_info pkg_base tarball_path
 	
-	read pkg_aur_info
+	read -r pkg_aur_info
 
-	pkg_base=$( jshon -e results -e PackageBase -u <<< "$pkg_aur_info" )
+	{
-	tarball_path=$( jshon -e results -e URLPath -u <<< "$pkg_aur_info" )
+		read -r pkg_base
+		read -r tarball_path
+	} < <(
+		jshon -e results -e PackageBase -u -p -e URLPath -u <<< "$pkg_aur_info"
+	)
 
 	cd "$cfg_workdir"
 
@@ -84,7 +97,7 @@ aur.get() {
 		aur_deps_count=$( jshon -e resultcount <<< "$aur_deps_api_data" )
 
 		if (( aur_deps_count )); then
-			aur_deps=$( jshon -e results -a -e Name -u <<< "$aur_deps_api_data" )
+			aur_deps=( $( jshon -e results -a -e Name -u <<< "$aur_deps_api_data" ) )
 
 			for i in "${aur_deps[@]}"; do
 				aur.get < <(aur.info "$i") || {
@@ -110,6 +123,40 @@ abs.get() {
 	svn checkout "svn://svn.archlinux.org/${svn_repo}/${1}/trunk" "${cfg_workdir}/${1}"
 }
 
+args_norm() {
+	while (( $# )); do
+		unset -v arg opt c keys
+
+		case "$1" in
+			--) printf '%s\n' '--'; break;;
+
+			--*)
+				IFS='=' read -r arg opt <<< "$1"
+				printf '%s\n' "$arg"
+
+				[[ "$opt" ]] && {
+					printf '%s\n' "$opt"
+				}
+			;;
+
+			-*)
+				while read -r -n1 c
+				do
+					case "$c" in
+						-|'') :;;
+						*) keys+=( "-$c" );;
+					esac
+				done <<< "$1"
+
+				printf '%s\n' "${keys[@]}"
+			;;
+
+			*) printf '%s\n' "$1";;
+		esac
+		shift
+	done
+}
+
 main() {
 	if [[ -f "$HOME/.config/zpac.rc.sh" ]]; then
 		source "$HOME/.config/zpac.rc.sh"
@@ -117,14 +164,26 @@ main() {
 
 	while (( $# )); do
 		case "$1" in
-			--help|-h) usage; return 0;;
+			(-h) usage; return 0;;
 
-			-s) action='search';;
+			(-s) action='search';;
-			-d) action='get';;
+			(-A)
-			-D) flag_get_deps=1;;
+				action='search'
+				flag_search_aur=1;;
+			(-S)
+				action='search'
+				flag_search_syncdb=1;;
 
-			--) shift; break;;
+			(-d)
-			-*)
+				if [[ "$action" == 'get' ]]; then
+					flag_get_deps=1
+				else
+					action='get'
+				fi
+			;;
+
+			(--) shift; break;;
+			(-*)
 				err "Unknown key: $1"
 				usage
 				return 1
@@ -135,7 +194,14 @@ main() {
 		shift
 	done
 
-	action=${action:-"get"}
+	(( flag_search_aur && flag_search_syncdb )) && {
+		unset flag_search_aur flag_search_syncdb
+	}
+
+	[[ "$action" ]] || {
+		usage
+		return 1
+	}
 
 	if [[ "$1" ]]; then
 		package="$1"
@@ -158,7 +224,7 @@ main() {
 			if (( ! "$?" )); then
 				repo='aur'
 			else
-				while read; do
+				while read -r; do
 					if [[ "$REPLY" =~ ^Repository ]]; then
 						repo="${REPLY##* }"
 					fi
@@ -186,8 +252,13 @@ main() {
 		;;
 
 		(search)
-			if type -P package-query &>/dev/null; then
+			if (( flag_search_aur )); then
-				package-query -ASs "$package"
+				aur.search "$package" || {
+					err "No packages found."
+					return 1
+				}
+			elif (( flag_search_syncdb )); then
+				pacman -Ss "$package"
 			else
 				aur.search "$package" || { flag_aur_search_fail=1; }
 				pacman -Ss "$package" 2>/dev/null || { flag_pacman_search_fail=1; }
@@ -201,4 +272,4 @@ main() {
 	esac
 }
 
-main "$@"
+main $(args_norm "$@")