Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-10998. Fix bash tab completion code to work (Jim Hester via aw) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619887 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Allen Wittenauer 2014-08-22 18:25:09 +00:00
parent e6c3650070
commit 10d267975c
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -510,6 +510,8 @@ Release 2.6.0 - UNRELEASED
HADOOP-8896. Javadoc points to Wrong Reader and Writer classes HADOOP-8896. Javadoc points to Wrong Reader and Writer classes
in SequenceFile (Ray Chiang via aw) in SequenceFile (Ray Chiang via aw)
HADOOP-10998. Fix bash tab completion code to work (Jim Hester via aw)
OPTIMIZATIONS OPTIMIZATIONS
HADOOP-10838. Byte array native checksumming. (James Thomas via todd) HADOOP-10838. Byte array native checksumming. (James Thomas via todd)

28
hadoop-common-project/hadoop-common/src/contrib/bash-tab-completion/hadoop.sh
View File

@ -26,7 +26,7 @@ _hadoop() {
COMPREPLY=() COMPREPLY=()
cur=${COMP_WORDS[COMP_CWORD]} cur=${COMP_WORDS[COMP_CWORD]}
prev=${COMP_WORDS[COMP_CWORD-1]} prev=${COMP_WORDS[COMP_CWORD-1]}
script=`which ${COMP_WORDS[0]}` script=$(which ${COMP_WORDS[0]})
# Bash lets you tab complete things even if the script doesn't # Bash lets you tab complete things even if the script doesn't
# exist (or isn't executable). Check to make sure it is, as we # exist (or isn't executable). Check to make sure it is, as we
@ -36,9 +36,9 @@ _hadoop() {
1) 1)
# Completing the first argument (the command). # Completing the first argument (the command).
temp=`$script | grep -n "^\s*or"`; temp=$($script | grep -n "^\s*or");
temp=`$script | head -n $((${temp%%:*} - 1)) | awk '/^ / {print $1}' | sort | uniq`; temp=$($script | head -n $((${temp%%:*} - 1)) | awk '/^ / {print $1}' | sort | uniq);
COMPREPLY=(`compgen -W "${temp}" -- ${cur}`); COMPREPLY=($(compgen -W "${temp}" -- ${cur}));
return 0;; return 0;;
2) 2)
@ -51,21 +51,21 @@ _hadoop() {
dfs | dfsadmin | fs | job | pipes) dfs | dfsadmin | fs | job | pipes)
# One option per line, enclosed in square brackets # One option per line, enclosed in square brackets
temp=`$script ${COMP_WORDS[1]} 2>&1 | awk '/^[ \t]*\[/ {gsub("[[\\]]", ""); print $1}'`; temp=$($script ${COMP_WORDS[1]} 2>&1 | awk '/^[ \t]*\[/ {gsub("[[\\]]", ""); print $1}');
COMPREPLY=(`compgen -W "${temp}" -- ${cur}`); COMPREPLY=($(compgen -W "${temp}" -- ${cur}));
return 0;; return 0;;
jar) jar)
# Any (jar) file # Any (jar) file
COMPREPLY=(`compgen -A file -- ${cur}`); COMPREPLY=($(compgen -A file -- ${cur}));
return 0;; return 0;;
namenode) namenode)
# All options specified in one line, # All options specified in one line,
# enclosed in [] and separated with | # enclosed in [] and separated with |
temp=`$script ${COMP_WORDS[1]} -help 2>&1 | grep Usage: | cut -d '[' -f 2- | awk '{gsub("] \\| \\[|]", " "); print $0}'`; temp=$($script ${COMP_WORDS[1]} -help 2>&1 | grep Usage: | cut -d '[' -f 2- | awk '{gsub("] \\| \\[|]", " "); print $0}');
COMPREPLY=(`compgen -W "${temp}" -- ${cur}`); COMPREPLY=($(compgen -W "${temp}" -- ${cur}));
return 0;; return 0;;
*) *)
@ -83,26 +83,24 @@ _hadoop() {
# Pull the list of options, grep for the one the user is trying to use, # Pull the list of options, grep for the one the user is trying to use,
# and then select the description of the relevant argument # and then select the description of the relevant argument
temp=$((${COMP_CWORD} - 1)); temp=$((${COMP_CWORD} - 1));
temp=`$script ${COMP_WORDS[1]} 2>&1 | grep -- "${COMP_WORDS[2]} " | awk '{gsub("[[ \\]]", ""); print $0}' | cut -d '<' -f ${temp}`; temp=$($script ${COMP_WORDS[1]} 2>&1 | grep -- "${COMP_WORDS[2]} " | awk '{gsub("[[ \\]]", ""); print $0}' | cut -d '<' -f ${temp} | cut -d '>' -f 1);
if [ ${#temp} -lt 1 ]; then if [ ${#temp} -lt 1 ]; then
# No match # No match
return 1; return 1;
fi; fi;
temp=${temp:0:$((${#temp} - 1))};
# Now do completion based on the argument # Now do completion based on the argument
case $temp in case $temp in
path | src | dst) path | src | dst)
# DFS path completion # DFS path completion
temp=`$script ${COMP_WORDS[1]} -ls "${cur}*" 2>&1 | grep -vE '^Found ' | cut -f 1 | awk '{gsub("^.* ", ""); print $0;}'` temp=$($script ${COMP_WORDS[1]} -ls -d "${cur}*" 2>/dev/null | grep -vE '^Found ' | cut -f 1 | awk '{gsub("^.* ", ""); print $0;}');
COMPREPLY=(`compgen -W "${temp}" -- ${cur}`); COMPREPLY=($(compgen -W "${temp}" -- ${cur}));
return 0;; return 0;;
localsrc | localdst) localsrc | localdst)
# Local path completion # Local path completion
COMPREPLY=(`compgen -A file -- ${cur}`); COMPREPLY=($(compgen -A file -- ${cur}));
return 0;; return 0;;
*) *)