7e3d7825d2
This patch modifies the way available commands are tested; If a Mac user installs and uses GNU ls it is correctly detected and used. the ls_with_file_shortcuts now works on ZSH. It was failing with "command not found" due to parameters passed in $_ll_command which were interpreted as a command name.
171 lines
6.0 KiB
Bash
171 lines
6.0 KiB
Bash
# ------------------------------------------------------------------------------
|
||
# SCM Breeze - Streamline your SCM workflow.
|
||
# Copyright 2011 Nathan Broadbent (http://madebynathan.com). All Rights Reserved.
|
||
# Released under the LGPL (GNU Lesser General Public License)
|
||
# ------------------------------------------------------------------------------
|
||
|
||
# Wrap common commands with numeric argument expansion.
|
||
# Prepends everything with exec_scmb_expand_args,
|
||
# even if commands are already aliases or functions
|
||
if [ "$shell_command_wrapping_enabled" = "true" ] || [ "$bash_command_wrapping_enabled" = "true" ]; then
|
||
# Do it in a function so we don't bleed variables
|
||
function _git_wrap_commands() {
|
||
# Define 'whence' for bash, to get the value of an alias
|
||
type whence > /dev/null 2>&1 || function whence() { type "$@" | sed -e "s/.*is aliased to \`//" -e "s/'$//"; }
|
||
local cmd=''
|
||
for cmd in $(echo $scmb_wrapped_shell_commands); do
|
||
if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: Wrapping $cmd..."; fi
|
||
|
||
case "$(type $cmd 2>&1)" in
|
||
|
||
# Don't do anything if command already aliased, or not found.
|
||
*'exec_scmb_expand_args'*)
|
||
if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: $cmd is already wrapped"; fi;;
|
||
|
||
*'not found'*)
|
||
if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: $cmd not found!"; fi;;
|
||
|
||
*'is aliased to'*|*'is an alias for'*)
|
||
if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: $cmd is an alias"; fi
|
||
# Store original alias
|
||
local original_alias="$(whence $cmd)"
|
||
# Remove alias, so that which can return binary
|
||
unalias $cmd
|
||
|
||
# Detect original $cmd type, and escape
|
||
case "$(type $cmd 2>&1)" in
|
||
# Escape shell builtins with 'builtin'
|
||
*'is a shell builtin'*) local escaped_cmd="builtin $cmd";;
|
||
# Get full path for files with 'which'
|
||
*) local escaped_cmd="$(\which $cmd)";;
|
||
esac
|
||
|
||
# Expand original command into full path, to avoid infinite loops
|
||
local expanded_alias="$(echo $original_alias | sed "s%\(^\| \)$cmd\($\| \)%\\1$escaped_cmd\\2%")"
|
||
# Wrap previous alias with escaped command
|
||
alias $cmd="exec_scmb_expand_args $expanded_alias";;
|
||
|
||
*'is a'*'function'*)
|
||
if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: $cmd is a function"; fi
|
||
# Copy old function into new name
|
||
eval "$(declare -f $cmd | sed "s/^$cmd ()/__original_$cmd ()/")"
|
||
# Remove function
|
||
unset -f $cmd
|
||
# Create wrapped alias for old function
|
||
alias "$cmd"="exec_scmb_expand_args __original_$cmd";;
|
||
|
||
*'is a shell builtin'*)
|
||
if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: $cmd is a shell builtin"; fi
|
||
# Handle shell builtin commands
|
||
alias $cmd="exec_scmb_expand_args builtin $cmd";;
|
||
|
||
*)
|
||
if [ "${scmbDebug:-}" = "true" ]; then echo "SCMB: $cmd is an executable file"; fi
|
||
# Otherwise, command is a regular script or binary,
|
||
# and the full path can be found from 'which'
|
||
alias $cmd="exec_scmb_expand_args $(\which $cmd)";;
|
||
esac
|
||
done
|
||
# Clean up
|
||
declare -f whence > /dev/null && unset -f whence
|
||
}
|
||
_git_wrap_commands
|
||
fi
|
||
|
||
|
||
# BSD ls is different to Linux (GNU) ls
|
||
# test for BSD ls
|
||
ls --color=auto > /dev/null 2>&1
|
||
if [ $? -ne 0 ]; then
|
||
# ls is BSD
|
||
_ls_bsd="BSD"
|
||
fi
|
||
|
||
# test readlink
|
||
type readlink > /dev/null 2>&1
|
||
if [ $? -ne 0 ]; then
|
||
# no readlink
|
||
# Use perl abs_path, since readlink -f isn't available on OS X
|
||
_abs_path_command='perl -e "use Cwd "abs_path"; print abs_path(shift)"'
|
||
else
|
||
#readlink
|
||
_abs_path_command="readlink -f"
|
||
fi
|
||
|
||
if [ -n "$_ll_command" ]; then
|
||
# Function wrapper around 'll'
|
||
# 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
|
||
function ls_with_file_shortcuts {
|
||
local ll_output=''
|
||
|
||
if [ -z $_ls_bsd ]; then
|
||
ll_output="$(ls -lhv --group-directories-first --color "$@")"
|
||
else
|
||
ll_output="$(CLICOLOR_FORCE=1 ls -l -G "$@")"
|
||
fi
|
||
|
||
# Parse path from args
|
||
OLDIFS="$IFS"; IFS=$'\n'
|
||
for arg in $@; do
|
||
if [ -d "$arg" ]; then local rel_path="${arg%/}"; fi
|
||
done
|
||
IFS="$OLDIFS"
|
||
|
||
# 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
|
||
# After : -rw-rw-r-- 1 𝐍 𝐍 1.1K Sep 19 21:39 scm_breeze.sh
|
||
if [ -e $HOME/.user_sym ]; then
|
||
# Little bit of ruby golf to rejustify the user/group/size columns after replacement
|
||
function rejustify_ls_columns(){
|
||
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};\
|
||
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 "s/ $USER/ $(/bin/cat $HOME/.user_sym)/g" | rejustify_ls_columns)
|
||
fi
|
||
|
||
if [ "$(echo "$ll_output" | wc -l)" -gt "50" ]; then
|
||
echo -e "\e[33mToo many files to create shortcuts. Running plain ll command...\e[0m"
|
||
echo "$ll_output"
|
||
return 1
|
||
fi
|
||
|
||
# Use ruby to inject numbers into ls output
|
||
ruby -e "$( cat <<EOF
|
||
output = "$ll_output"
|
||
e = 1
|
||
re = /^(([^ ]* +){8})/
|
||
output.lines.each do |line|
|
||
next unless line.match(re)
|
||
puts line.sub(re, "\\\1\e[2;37m[\e[0m#{e}\e[2;37m]\e[0m" << (e < 10 ? " " : " "))
|
||
e += 1
|
||
end
|
||
EOF
|
||
)"
|
||
|
||
# Set numbered file shortcut in variable
|
||
local e=1
|
||
local ll_files=''
|
||
local file=''
|
||
|
||
if [ -z $_ls_bsd ]; then
|
||
ll_files="$(ls -v --group-directories-first --color=never "$@")"
|
||
else
|
||
ll_files="$(ls "$@")"
|
||
fi
|
||
|
||
OLDIFS="$IFS"; IFS=$'\n'
|
||
for file in $ll_files; do
|
||
if [ -n "$rel_path" ]; then file="$rel_path/$file"; fi
|
||
export $git_env_char$e="$(eval $_abs_path_command \"$file\")"
|
||
if [ "${scmbDebug:-}" = "true" ]; then echo "Set \$$git_env_char$e => $file"; fi
|
||
let e++
|
||
done
|
||
IFS="$OLDIFS"
|
||
}
|
||
fi
|
||
|
||
# Setup aliases
|
||
alias ll="exec_scmb_expand_args ls_with_file_shortcuts"
|
||
alias la="ll -A" |