From 02a414f9cbc6a4a5ffa5d91f4ce75a327cd87ec5 Mon Sep 17 00:00:00 2001 From: stubbfel Date: Thu, 8 Jun 2023 12:36:39 +0200 Subject: [PATCH] update --- flake.nix | 2 +- spec/patch-manjaro-sway-mirror-for-arm_spec.sh | 2 +- src/patch-manjaro-sway-mirror-for-arm.sh | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index bcbcdbd..0d76a4f 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,7 @@ default = nixpkgsFor.${system}.stdenv.mkDerivation { name = name; src = self; - buildPhase = "echo nothing todo"; + buildPhase = "makepkg -s"; installPhase = "mkdir -p $out/bin; install -t $out/bin src/patch-manjaro-sway-mirror-for-arm.sh"; }; }); diff --git a/spec/patch-manjaro-sway-mirror-for-arm_spec.sh b/spec/patch-manjaro-sway-mirror-for-arm_spec.sh index 0349e45..789b2fa 100644 --- a/spec/patch-manjaro-sway-mirror-for-arm_spec.sh +++ b/spec/patch-manjaro-sway-mirror-for-arm_spec.sh @@ -40,7 +40,7 @@ Describe "patch-manjaro-sway-mirror-for-arm.sh - Test Suite" The status should be success The contents of file "${target_file}" should equal "${test_content}" # shellcheck disable=SC2016 - The output should equal "sed -i \"s|\\\$(pacman-mirrors -G)|\\\$(pacman-mirrors -G \| sed \\\"s/^arm-//\\\")|g\" \"${target_file}\" + The output should equal "sed -i 's|\\\$(pacman-mirrors -G)|\\\$(pacman-mirrors -G \| sed \\\"s/^arm-//\\\")|g' '${target_file}' curl -s \"https://pkg.manjaro-sway.download/\$(pacman-mirrors -G | sed \"s/^arm-//\")/testing\"" End End diff --git a/src/patch-manjaro-sway-mirror-for-arm.sh b/src/patch-manjaro-sway-mirror-for-arm.sh index 9502e51..44280e2 100755 --- a/src/patch-manjaro-sway-mirror-for-arm.sh +++ b/src/patch-manjaro-sway-mirror-for-arm.sh @@ -11,9 +11,6 @@ usage() { exit 0 } -# Default values -dry_run=false - # Parse command-line options while [ $# -gt 0 ]; do case "$1" in @@ -52,6 +49,11 @@ while [ $# -gt 0 ]; do shift done +# Apply default values if required +if [ -z "$dry_run" ]; then + dry_run=false +fi + if [ -z "$target_file" ]; then target_file="${MSMAP_TARGET_ROOT}/usr/bin/manjaro-sway-mirrors" fi @@ -66,7 +68,7 @@ if [ -z "$replace_pattern" ]; then replace_pattern='\$(pacman-mirrors -G \| sed \"s/^arm-//\")' fi -sed_command="sed -i \"s|${search_pattern}|${replace_pattern}|g\" \"${target_file}\"" +sed_command="sed -i 's|${search_pattern}|${replace_pattern}|g' '${target_file}'" # Perform the sed command if $dry_run; then echo "$sed_command"