Readme update

+ a bugfix.

README.md

@@ -7,4 +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

@@ -5,7 +5,9 @@
 
 _self="${0##*/}"
 
-cfg_workdir="/tmp/$USER/zpac"
+cfg_workdir="$PWD"
+cfg_aur_url='https://aur.archlinux.org'
+cfg_aur_api="${cfg_aur_url}/rpc.php"
 
 echo() { printf '%s\n' "$*"; }
 err() { echo "$*" >&2; }
@@ -16,26 +18,121 @@ usage() {
 		Flags:
 		        -h        Show this message.
 		        -s        Search for <package>.
-		        -d        Get the package sources (default).
+		          -S        Search only in the sync db. Implies -s.
+		          -A        Search only in AUR. Implies -s.
+		        -d        Get the package sources (default). Set twice to also get the dependencies.
+		          -f        Force downloading package sources even if they are already present in the working directory.
+		        -w <dir>  Set the working directory.
+
+		Warning! Due to how the argument handling works, you can do this:
+		  $ zpac -wdd /tmp/workdir package
+		Where /tmp/workdir is an argument to w. Don't do this. But it works, unfortunately.
 	EOF
 }
 
+aur.search() {
+	local aur_api_search_data aur_search_result_num pkg
+
+	aur_api_search_data=$( curl -skL "${cfg_aur_api}?type=search&arg=${1}" )
+	aur_search_result_num=$( jshon -e resultcount -u <<< "$aur_api_search_data" )
+
+	if (( aur_search_result_num )); then
+		aur_search_results=( $( jshon -e results -a -e Name -u <<< "$aur_api_search_data" ) )
+
+		for i in "${!aur_search_results[@]}"; do
+			{
+				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
+	fi
+}
+
+aur.info() {
+	local pkg_aur_info=$( curl -skL "${cfg_aur_api}?type=info&arg=${1}" 2>/dev/null )
+	local aur_query_result=$( jshon -e resultcount -u <<< "$pkg_aur_info" )
+
+	if (( aur_query_result )); then
+		echo "$pkg_aur_info"
+	else
+		return 1
+	fi
+}
+
 aur.get() {
-	local tarball_url=$(package-query -1 -AS -f %u "$1")
+	local dep_name aur_api_multireq aur_deps_api_data aur_deps_count aur_deps pkg_aur_info pkg_base tarball_path
+	
+	read -r pkg_aur_info
+
+	{
+		read -r pkg_base
+		read -r tarball_path
+	} < <(
+		jshon -e results -e PackageBase -u -p -e URLPath -u <<< "$pkg_aur_info"
+	)
+
+	(( flag_force )) || {
+		[[ -d "${cfg_workdir}/${pkg_base}" ]] && {
+			echo "Found ${pkg_base} in ${cfg_workdir}, skipping. Use -f to override."
+			return 17
+		}
+	}
 
 	cd "$cfg_workdir"
 
-	echo "Downloading $tarball_url"
-	{ curl "$tarball_url" | gzip -d | tar x; } || {
+	echo "Working in ${cfg_workdir}"
+
+	echo "Downloading ${pkg_base}"
+	{ curl -skL "${cfg_aur_url}${tarball_path}" | gzip -d | tar x; } || {
 		err "Fail!"
 		return 1
 	}
+
+	if (( flag_get_deps )); then
+		unset depends makedepends
+
+		cd "${cfg_workdir}/${pkg_base}"
+		source PKGBUILD
+
+		for i in "${depends[@]}" "${makedepends[@]}"; do
+			dep_name="${i/[<>=]*}"
+			aur_api_multireq+="&arg\[\]=$dep_name"
+		done
+		
+		aur_deps_api_data=$( curl -skL "${cfg_aur_api}?type=multiinfo${aur_api_multireq}" )
+		aur_deps_count=$( jshon -e resultcount <<< "$aur_deps_api_data" )
+
+		if (( aur_deps_count )); then
+			echo "Getting dependencies for ${pkg_base}."
+
+			aur_deps=( $( jshon -e results -a -e Name -u <<< "$aur_deps_api_data" ) )
+
+			for i in "${aur_deps[@]}"; do
+				aur.get < <(aur.info "$i")
+				_result="$?"
+
+				(( _result )) && {
+					(( _result == 17 )) || {
+						return "$_result"
+					}
+				}
+			done
+		fi
+	fi
 }
 
 abs.get() {
-	local svn_repo
+	local pkg_repo svn_repo
 
-	case "$package_repo" in
+	pkg_repo="$2"
+
+	case "$pkg_repo" in
 		(community|multilib)
 			svn_repo='community';;
 		(*)
@@ -46,28 +143,73 @@ abs.get() {
 }
 
 main() {
+	if [[ -f "$HOME/.config/zpac.rc.sh" ]]; then
+		source "$HOME/.config/zpac.rc.sh"
+	fi
+
 	while (( $# )); do
 		case "$1" in
-			--help|-h) usage; return 0;;
+			(--) shift; break;;
 
-			-s) action='search';;
-			-d) action='get';;
+			(-*)
+				while read -n1 c
+				do
+					case "$c" in
+						(-|'') :;;
 
-			--) shift; break;;
-			-*)
+						(h) usage; return 0;;
+
+						(s) action='search';;
+						(A)
+							action='search'
+							flag_search_aur=1;;
+						(S)
+							action='search'
+							flag_search_syncdb=1;;
+
+						(d)
+							if [[ "$action" == 'get' ]]; then
+								flag_get_deps=1
+							else
+								action='get'
+							fi
+						;;
+
+						(w) 
+							cfg_workdir="$2"
+							shift;;
+
+						(f) flag_force=1;;
+
+						(*)
 							err "Unknown key: $1"
 							usage
 							return 1
 						;;
+					esac
+				done <<< "$1"
+			;;
 
-			*) break;;
+			(*) break;;
 		esac
 		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"
+	else
+		usage
+		return 1
+	fi
 
 	case "$action" in
 		(get)
@@ -78,21 +220,31 @@ main() {
 				}
 			}
 
-			IFS='/' read repo _ < <( package-query -AS -f '%r/%n' "$package" )
+			pkg_aur_info=$( aur.info "$package" )
 
-			if [[ "$?" > 0 ]]; then
-				err "Can't find package: $package"
+			if (( ! "$?" )); then
+				repo='aur'
+			else
+				while read -r; do
+					if [[ "$REPLY" =~ ^Repository ]]; then
+						repo="${REPLY##* }"
+					fi
+				done < <( pacman -Si "$package" )
+
+				[[ "$repo" ]] || {
+					err "Can't find package ${package}"
 					return 1
+				}
 			fi
 
 			echo "Found ${package} in ${repo}."
 
 			case "$repo" in
 				(aur)
-					aur.get "$package";;
+					aur.get <<< "$pkg_aur_info";;
 
 				(core|extra|community|multilib)
-					abs.get "$package";;
+					abs.get "$package" "$repo";;
 
 				(*)
 					err "Repository $repo not supported."
@@ -101,7 +253,22 @@ main() {
 		;;
 
 		(search)
-			package-query -ASs "$package"
+			if (( flag_search_aur )); then
+				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; }
+
+				if (( flag_aur_search_fail && flag_pacman_search_fail )); then
+					err "No packages found."
+					return 1
+				fi
+			fi
 		;;
 	esac
 }