flo/scm_breeze
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make ls aliases optional

Browse Source
This commit is contained in:
Jean Blanchard
2015-03-06 09:38:15 +00:00
parent 5ea1e69405
commit 349896b0cf
3 changed files with 66 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git.scmbrc.example
View File

@@ -114,3 +114,5 @@ git_commit_all_with_ci_skip_keys="\C-xv" # CTRL+x, v (Appends [ci skip] to c
shell_command_wrapping_enabled="true" shell_command_wrapping_enabled="true"
# Here you can tweak the list of wrapped commands. # Here you can tweak the list of wrapped commands.
scmb_wrapped_shell_commands="vim emacs gedit cat rm cp mv ln cd" scmb_wrapped_shell_commands="vim emacs gedit cat rm cp mv ln cd"
# Add numbered shortcuts to output of ls -l, just like 'git status'
shell_ls_aliases_enabled="true"

124
lib/git/shell_shortcuts.sh
View File

@@ -108,50 +108,51 @@ fi
# Function wrapper around 'll' # Function wrapper around 'll'
# Adds numbered shortcuts to output of ls -l, just like 'git status' # Adds numbered shortcuts to output of ls -l, just like 'git status'
unalias ll > /dev/null 2>&1; unset -f ll > /dev/null 2>&1 if [ "$shell_ls_aliases_enabled" = "true" ]; then
function ls_with_file_shortcuts { unalias ll > /dev/null 2>&1; unset -f ll > /dev/null 2>&1
local ll_output function ls_with_file_shortcuts {
if [ "$_ls_bsd" != "BSD" ]; then local ll_output
ll_output="$(\ls -lhv --group-directories-first --color "$@")" if [ "$_ls_bsd" != "BSD" ]; then
else ll_output="$(\ls -lhv --group-directories-first --color "$@")"
ll_output="$(CLICOLOR_FORCE=1 \ls -l -G "$@")" else
fi ll_output="$(CLICOLOR_FORCE=1 \ls -l -G "$@")"
fi
if [[ $shell == "zsh" ]]; then if [[ $shell == "zsh" ]]; then
# Ensure sh_word_split is on # Ensure sh_word_split is on
if setopt | grep -q shwordsplit; then SHWORDSPLIT_ON=true; fi if setopt | grep -q shwordsplit; then SHWORDSPLIT_ON=true; fi
setopt shwordsplit setopt shwordsplit
fi fi
# Parse path from args # Parse path from args
OLDIFS="$IFS"; IFS=$'\n' OLDIFS="$IFS"; IFS=$'\n'
for arg in $@; do for arg in $@; do
if [ -d "$arg" ]; then local rel_path="${arg%/}"; fi if [ -d "$arg" ]; then local rel_path="${arg%/}"; fi
done done
IFS="$OLDIFS" IFS="$OLDIFS"
# Replace user/group with user symbol, if defined at ~/.user_sym # Replace user/group with user symbol, if defined at ~/.user_sym
# Before : -rw-rw-r-- 1 ndbroadbent ndbroadbent 1.1K Sep 19 21:39 scm_breeze.sh # Before : -rw-rw-r-- 1 ndbroadbent ndbroadbent 1.1K Sep 19 21:39 scm_breeze.sh
# After : -rw-rw-r-- 1 𝐍 𝐍 1.1K Sep 19 21:39 scm_breeze.sh # After : -rw-rw-r-- 1 𝐍 𝐍 1.1K Sep 19 21:39 scm_breeze.sh
if [ -e $HOME/.user_sym ]; then if [ -e $HOME/.user_sym ]; then
# Little bit of ruby golf to rejustify the user/group/size columns after replacement # Little bit of ruby golf to rejustify the user/group/size columns after replacement
function rejustify_ls_columns(){ function rejustify_ls_columns(){
ruby -e "o=STDIN.read;re=/^(([^ ]* +){2})(([^ ]* +){3})/;\ ruby -e "o=STDIN.read;re=/^(([^ ]* +){2})(([^ ]* +){3})/;\
u,g,s=o.lines.map{|l|l[re,3]}.compact.map(&:split).transpose.map{|a|a.map(&:size).max+1};\ u,g,s=o.lines.map{|l|l[re,3]}.compact.map(&:split).transpose.map{|a|a.map(&:size).max+1};\
puts o.lines.map{|l|l.sub(re){|m|\"%s%-#{u}s %-#{g}s%#{s}s \"%[\$1,*\$3.split]}}" puts o.lines.map{|l|l.sub(re){|m|\"%s%-#{u}s %-#{g}s%#{s}s \"%[\$1,*\$3.split]}}"
} }
ll_output=$(echo "$ll_output" | \sed -$SED_REGEX_ARG "s/ $USER/ $(/bin/cat $HOME/.user_sym)/g" | rejustify_ls_columns) ll_output=$(echo "$ll_output" | \sed -$SED_REGEX_ARG "s/ $USER/ $(/bin/cat $HOME/.user_sym)/g" | rejustify_ls_columns)
fi fi
if [ "$(echo "$ll_output" | wc -l)" -gt "50" ]; then if [ "$(echo "$ll_output" | wc -l)" -gt "50" ]; then
echo -e "\033[33mToo many files to create shortcuts. Running plain ll command...\033[0m" echo -e "\033[33mToo many files to create shortcuts. Running plain ll command...\033[0m"
echo "$ll_output" echo "$ll_output"
return 1 return 1
fi fi
# Use ruby to inject numbers into ls output # Use ruby to inject numbers into ls output
echo "$ll_output" | ruby -e "$( \cat <<EOF echo "$ll_output" | ruby -e "$( \cat <<EOF
output = STDIN.read output = STDIN.read
e = 1 e = 1
re = /^(([^ ]* +){8})/ re = /^(([^ ]* +){8})/
@@ -163,30 +164,31 @@ end
EOF EOF
)" )"
# Set numbered file shortcut in variable # Set numbered file shortcut in variable
local e=1 local e=1
local ll_files='' local ll_files=''
local file='' local file=''
if [ -z $_ls_bsd ]; then if [ -z $_ls_bsd ]; then
ll_files="$(\ls -v --group-directories-first --color=never "$@")" ll_files="$(\ls -v --group-directories-first --color=never "$@")"
else else
ll_files="$(\ls "$@")" ll_files="$(\ls "$@")"
fi fi
OLDIFS="$IFS"; IFS=$'\n' OLDIFS="$IFS"; IFS=$'\n'
for file in $ll_files; do for file in $ll_files; do
if [ -n "$rel_path" ]; then file="$rel_path/$file"; fi if [ -n "$rel_path" ]; then file="$rel_path/$file"; fi
export $git_env_char$e="$(eval $_abs_path_command \"${file//\"/\\\"}\")" export $git_env_char$e="$(eval $_abs_path_command \"${file//\"/\\\"}\")"
if [ "${scmbDebug:-}" = "true" ]; then echo "Set \$$git_env_char$e => $file"; fi if [ "${scmbDebug:-}" = "true" ]; then echo "Set \$$git_env_char$e => $file"; fi
let e++ let e++
done done
IFS="$OLDIFS" IFS="$OLDIFS"
# Turn off shwordsplit unless it was on previously # Turn off shwordsplit unless it was on previously
if [[ $shell == "zsh" ]] && [ -z "$SHWORDSPLIT_ON" ]; then unsetopt shwordsplit; fi if [[ $shell == "zsh" ]] && [ -z "$SHWORDSPLIT_ON" ]; then unsetopt shwordsplit; fi
} }
# Setup aliases # Setup aliases
alias ll="exec_scmb_expand_args ls_with_file_shortcuts" alias ll="exec_scmb_expand_args ls_with_file_shortcuts"
alias la="ll -A" alias la="ll -A"
fi

1
test/lib/git/shell_shortcuts_test.sh
View File

@@ -26,6 +26,7 @@ source "$scmbDir/lib/scm_breeze.sh"
oneTimeSetUp() { oneTimeSetUp() {
export shell_command_wrapping_enabled="true" export shell_command_wrapping_enabled="true"
export scmb_wrapped_shell_commands="not_found cat rm cp mv ln cd sed" export scmb_wrapped_shell_commands="not_found cat rm cp mv ln cd sed"
export shell_ls_aliases_enabled="true"
alias rvm="test" # Ensure tests run if RVM isn't loaded but $HOME/.rvm is present alias rvm="test" # Ensure tests run if RVM isn't loaded but $HOME/.rvm is present