Revert "JShell07's local pull request"

This commit is contained in:
JShell07 2018-03-16 10:24:04 +08:00 committed by GitHub
commit 663b3b4691
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
97 changed files with 709 additions and 2226 deletions

View file

@ -8,7 +8,7 @@
# @github.com/mfaerevaag/wd
# version
readonly WD_VERSION=0.4.6
readonly WD_VERSION=0.4.2
# colors
readonly WD_BLUE="\033[96m"
@ -72,28 +72,25 @@ wd_print_msg()
wd_print_usage()
{
cat <<- EOF
Usage: wd [command] [point]
Usage: wd [command] <point>
Commands:
add <point> Adds the current working directory to your warp points
add Adds the current working directory to your warp points with current directory's name
add! <point> Overwrites existing warp point
add! Overwrites existing warp point with current directory's name
rm <point> Removes the given warp point
rm Removes the given warp point with current directory's name
show <point> Print path to given warp point
show Print warp points to current directory
list Print all stored warp points
ls <point> Show files from given warp point (ls)
path <point> Show the path to given warp point (pwd)
clean! Remove points warping to nonexistent directories
add <point> Adds the current working directory to your warp points
add! <point> Overwrites existing warp point
rm <point> Removes the given warp point
show Print warp points to current directory
show <point> Print path to given warp point
list Print all stored warp points
ls <point> Show files from given warp point
path <point> Show the path to given warp point
clean! Remove points warping to nonexistent directories
-v | --version Print version
-d | --debug Exit after execution with exit codes (for testing)
-c | --config Specify config file (default ~/.warprc)
-q | --quiet Suppress all output
-v | --version Print version
-d | --debug Exit after execution with exit codes (for testing)
-c | --config Specify config file (default ~/.warprc)
-q | --quiet Suppress all output
help Show this extremely helpful text
help Show this extremely helpful text
EOF
}
@ -134,11 +131,10 @@ wd_getdir()
wd_warp()
{
local point=$1
local sub=$2
if [[ $point =~ "^\.+$" ]]
then
if [[ $#1 < 2 ]]
if [ $#1 < 2 ]
then
wd_exit_warn "Warping to current directory?"
else
@ -147,12 +143,7 @@ wd_warp()
fi
elif [[ ${points[$point]} != "" ]]
then
if [[ $sub != "" ]]
then
cd ${points[$point]/#\~/$HOME}/$sub
else
cd ${points[$point]/#\~/$HOME}
fi
cd ${points[$point]/#\~/$HOME}
else
wd_exit_fail "Unknown warp point '${point}'"
fi
@ -163,11 +154,6 @@ wd_add()
local force=$1
local point=$2
if [[ $point == "" ]]
then
point=$(basename $PWD)
fi
if [[ $point =~ "^[\.]+$" ]]
then
wd_exit_fail "Warp point cannot be just dots"
@ -177,7 +163,10 @@ wd_add()
elif [[ $point == *:* ]]
then
wd_exit_fail "Warp point cannot contain colons"
elif [[ ${points[$point]} == "" ]] || $force
elif [[ $point == "" ]]
then
wd_exit_fail "Warp point cannot be empty"
elif [[ ${points[$2]} == "" ]] || $force
then
wd_remove $point > /dev/null
printf "%q:%s\n" "${point}" "${PWD/#$HOME/~}" >> $WD_CONFIG
@ -196,11 +185,6 @@ wd_remove()
{
local point=$1
if [[ $point == "" ]]
then
point=$(basename $PWD)
fi
if [[ ${points[$point]} != "" ]]
then
local config_tmp=$WD_CONFIG.tmp
@ -310,7 +294,7 @@ wd_clean() {
key=${arr[1]}
val=${arr[2]}
if [ -d "${val/#\~/$HOME}" ]
if [ -d "$val" ]
then
wd_tmp=$wd_tmp"\n"`echo $line`
else
@ -372,8 +356,7 @@ while read -r line
do
arr=(${(s,:,)line})
key=${arr[1]}
# join the rest, in case the path contains colons
val=${(j,:,)arr[2,-1]}
val=${arr[2]}
points[$key]=$val
done < $WD_CONFIG
@ -441,7 +424,7 @@ else
break
;;
*)
wd_warp $o $2
wd_warp $o
break
;;
--)