README

+ a bugfix.

README.md

@@ -2,11 +2,15 @@ zpac
 ----
 A very simple AUR/ABS helper. Doesn't build packages, only gets the sources.
 
-	$ zpac -h
+Usage: zpac [flags] <package>
-	Usage: zpac [flags] <package>
+Flags:
-	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.
 
 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,11 @@ 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.
-				-D        If used with -d, makes $_self download the dependencies from AUR too.
+		          -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.
 	EOF
 }
 
@@ -33,7 +36,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,21 +64,32 @@ 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"
+	)
+
+	(( 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 ${cfg_aur_url}${tarball_path}"
+	echo "Working in ${cfg_workdir}"
+
+	echo "Downloading ${pkg_base}"
 	{ curl -skL "${cfg_aur_url}${tarball_path}" | gzip -d | tar x; } || {
 		err "Fail!"
 		return 1
 	}
 
-	echo ": ${cfg_workdir}/${pkg_base}"
-
 	if (( flag_get_deps )); then
 		unset depends makedepends
 
@@ -84,11 +105,18 @@ 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" )
+			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") || {
+				aur.get < <(aur.info "$i")
-					return "$?"
+				_result="$?"
+
+				(( _result )) && {
+					(( _result == 17 )) || {
+						return "$_result"
+					}
 				}
 			done
 		fi
@@ -110,6 +138,41 @@ abs.get() {
 	svn checkout "svn://svn.archlinux.org/${svn_repo}/${1}/trunk" "${cfg_workdir}/${1}"
 }
 
+args_norm() {
+	declare arg opt c
+	declare -g argv
+
+	while (( $# )); do
+		unset -v arg opt c
+
+		case "$1" in
+			(--) argv+=( "$1" ); break;;
+
+			(--*)
+				IFS='=' read arg opt <<< "$1"
+				argv+=( "$arg" )
+
+				[[ "$opt" ]] && {
+					argv+=( "$opt" )
+				}
+			;;
+
+			(-*)
+				while read -n1 c
+				do
+					case "$c" in
+						-|'') :;;
+						*) argv+=( "-$c" );;
+					esac
+				done <<< "$1"
+			;;
+
+			(*) argv+=( "$1" );;
+		esac
+		shift
+	done
+}
+
 main() {
 	if [[ -f "$HOME/.config/zpac.rc.sh" ]]; then
 		source "$HOME/.config/zpac.rc.sh"
@@ -117,25 +180,51 @@ main() {
 
 	while (( $# )); do
 		case "$1" in
-			--help|-h) usage; return 0;;
+			(--) shift; break;;
 
-			-s) action='search';;
+			(-h) usage; return 0;;
-			-d) action='get';;
-			-D) flag_get_deps=1;;
 
-			--) shift; break;;
+			(-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
 			;;
 
-			*) 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"
@@ -158,7 +247,7 @@ main() {
 			if (( ! "$?" )); then
 				repo='aur'
 			else
-				while read; do
+				while read -r; do
 					if [[ "$REPLY" =~ ^Repository ]]; then
 						repo="${REPLY##* }"
 					fi
@@ -186,8 +275,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 +295,5 @@ main() {
 	esac
 }
 
-main "$@"
+args_norm "$@"
+main "${argv[@]}"