From cb8a3a61218547e1eaad4bf63ab5489d001bf582 Mon Sep 17 00:00:00 2001 From: Andrew Lorente Date: Thu, 20 Oct 2011 13:47:19 -0700 Subject: [PATCH] Remove dependency on seq seq is unfortunately not available on OSX. Brackets appear to be fully shell- and platform-independent. --- lib/git/status_shortcuts.sh | 4 +--- test/lib/git/status_shortcuts_test.sh | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/git/status_shortcuts.sh b/lib/git/status_shortcuts.sh index 861a59b..64a68f8 100644 --- a/lib/git/status_shortcuts.sh +++ b/lib/git/status_shortcuts.sh @@ -103,9 +103,7 @@ git_expand_args() { if [[ "$arg" =~ ^[0-9]+$ ]] ; then # Substitute $e{*} variables for any integers files="$files $(eval echo \$$git_env_char$arg)" elif [[ $arg =~ ^[0-9]+\.\.[0-9]+$ ]]; then # Expand ranges into $e{*} variables - for i in $(seq $(echo $arg | tr ".." " ")); do - files="$files $(eval echo \$$git_env_char$i)" - done + files="$files $(eval echo \$$git_env_char{$arg})" else # Otherwise, treat $arg as a normal string. # If arg contains any spaces, (re)wrap it in double quotes if echo $arg | grep -q " "; then arg="\"$arg\""; fi diff --git a/test/lib/git/status_shortcuts_test.sh b/test/lib/git/status_shortcuts_test.sh index cedee73..1776a17 100755 --- a/test/lib/git/status_shortcuts_test.sh +++ b/test/lib/git/status_shortcuts_test.sh @@ -199,7 +199,7 @@ test_git_status_shortcuts_max_changes() { # Add 5 untracked files touch a b c d e git_status=$(git_status_shortcuts | strip_colors) - for i in $(seq 1 5); do + for i in {1..5}; do assertIncludes "$git_status" "\[$i\]" || return done