Avoid variables being modified beyond intended scope.

install.sh

@@ -13,39 +13,36 @@ install_files() {
 		echo "Source directory ${source_dir} does not exist, skipping."
 		return
 	fi
-	(
+	for f in "${source_dir}"/*; do
-		cd "${source_dir}"
+		case "$(basename "$f")" in
-		for f in "${source_dir}"/*; do
+		dotfiles)
-			case "$(basename "$f")" in
+			(install_files "${target_dir}" "$f" .)
-			dotfiles)
+			;;
-				install_files "${target_dir}" "$f" .
+		*.jq)
-				;;
+			tmpfile="$(mktemp)"
-			*.jq)
+			if [ -f "$f" ]; then
 				tmpfile="$(mktemp)"
-				if [ -f "$f" ]; then
+				target_file="${target_dir}/$(basename "$f" .jq)"
-					tmpfile="$(mktemp)"
+				if [ -f "$target_file" ]; then
-					target_file="${target_dir}/$(basename "$f" .jq)"
+					cat "$target_file"
-					if [ -f "$target_file" ]; then
-						cat "$target_file"
-					else
-						echo "{}"
-					fi | jq "$(cat "$f")" > "$tmpfile"
-					mv -v "$tmpfile" "$target_file"
 				else
-					echo "Expected source file with .jq extension not to be a directory."
+					echo "{}"
-					exit 1
+				fi | jq "$(cat "$f")" > "$tmpfile"
-				fi
+				mv -v "$tmpfile" "$target_file"
-				;;
+			else
-			*)
+				echo "Expected source file with .jq extension not to be a directory."
-				if [ -d "$f" ]; then
+				exit 1
-					install_files "${target_dir}/${target_filename_prefix}$(basename "$f")" "$f"
+			fi
-				else
+			;;
-					cp -v "$f" "${target_dir}/${target_filename_prefix}$(basename "$f")"
+		*)
-				fi
+			if [ -d "$f" ]; then
-				;;
+				(install_files "${target_dir}/${target_filename_prefix}$(basename "$f")" "$f")
-			esac
+			else
-		done
+				cp -v "$f" "${target_dir}/${target_filename_prefix}$(basename "$f")"
-	)
+			fi
+			;;
+		esac
+	done
 }
 
 ###

packages/packages.sh

@@ -77,7 +77,6 @@ if has_tags pm:pacman; then
 			powerline-fonts \
 			rxvt-unicode-better-wheel-scrolling-unicode3 \
 			ttf-fantasque-sans-mono \
-			rxvt-unicode \
 			urxvt-tabbedex \
 			ibus
 	else