Commit a1d4f0a
xxwhirlpool
·
2026-03-20 15:02:50 -0400 EDT
parent bba10d3
more bin cleanup
5 files changed,
+29,
-22
+3,
-1
| ... | ... | @@ -15,4 +15,6 @@ else | |
| 15 | 15 | cat_cmd="batcat" | |
| 16 | 16 | fi | |
| 17 | 17 | ||
| 18 | - | "$cat_cmd" "$(command -v "$1")" | |
| 18 | + | catfile=$(command -v "$1") | |
| 19 | + | ||
| 20 | + | [[ -f "$catfile" ]] && "$cat_cmd" "$catfile" || echo "$1 does not exist" |
+2,
-6
| ... | ... | @@ -1,10 +1,6 @@ | |
| 1 | 1 | #!/usr/bin/env bash | |
| 2 | 2 | ||
| 3 | 3 | cmd="$1" | |
| 4 | + | editfile=$(command -v "$cmd") | |
| 4 | 5 | ||
| 5 | - | if [[ ! $(command -v "$cmd") ]]; then | |
| 6 | - | echo "command does not exist" | |
| 7 | - | exit 1 | |
| 8 | - | fi | |
| 9 | - | ||
| 10 | - | micro "$(command -v "$cmd")" | |
| 6 | + | [[ -f "$editfile" ]] && micro "$editfile" || echo "$1 does not exist" |
+1,
-1
| ... | ... | @@ -3,7 +3,7 @@ | |
| 3 | 3 | # view files with merge conflict markers | |
| 4 | 4 | ||
| 5 | 5 | if [[ ! "$(command -v batcat)" ]]; then | |
| 6 | - | less_cmd="cat" | |
| 6 | + | less_cmd="less" | |
| 7 | 7 | else | |
| 8 | 8 | less_cmd="batcat" | |
| 9 | 9 | fi |
+17,
-13
| ... | ... | @@ -2,20 +2,24 @@ | |
| 2 | 2 | ||
| 3 | 3 | if [[ $# -eq 0 ]]; then | |
| 4 | 4 | echo "Usage: mksh [-b] [FILENAME]" | |
| 5 | - | echo " --bin puts it in PATH" | |
| 6 | - | echo " otherwise default to pwd" | |
| 5 | + | echo " -b puts it in PATH" | |
| 6 | + | echo " else default to pwd" | |
| 7 | 7 | exit 1 | |
| 8 | 8 | fi | |
| 9 | 9 | ||
| 10 | - | LCLBIN_PATH="/home/kat/dotfiles/config/.local/bin" | |
| 10 | + | cmd="$1" | |
| 11 | + | localpath="/home/kat/dotfiles/config/.local/bin" | |
| 11 | 12 | ||
| 12 | - | if [[ "$1" == "-b" ]]; then | |
| 13 | - | echo "#!/usr/bin/env bash" > "$2" | |
| 14 | - | chmod u+x "$2" | |
| 15 | - | mv "$2" "$LCLBIN_PATH" | |
| 16 | - | micro "$LCLBIN_PATH/$2" | |
| 17 | - | elif [[ "$1" != "-b" ]]; then | |
| 18 | - | echo "#!/usr/bin/env bash" > "$1" | |
| 19 | - | chmod u+x "$1" | |
| 20 | - | micro "$1" | |
| 21 | - | fi | |
| 13 | + | default() { | |
| 14 | + | echo -e "#!/usr/bin/env bash\n" > "$cmd" | |
| 15 | + | chmod u+x "$cmd" | |
| 16 | + | } | |
| 17 | + | ||
| 18 | + | openfile() { | |
| 19 | + | mv "$cmd" "$localpath" && micro "$localpath/$cmd" | |
| 20 | + | } | |
| 21 | + | ||
| 22 | + | case "$1" in | |
| 23 | + | "-b") cmd="$2"; default "$@" && openfile "$@";; | |
| 24 | + | *) default "$@" && micro "$cmd";; | |
| 25 | + | esac |
+6,
-1