From d3c40428d73b6aaf437426e7f294bb1aa5254aab Mon Sep 17 00:00:00 2001 From: Reid 'arrdem' McKenzie Date: Sat, 26 Nov 2022 12:03:29 -0700 Subject: [PATCH] De-conflict the sed helper, get add working --- _sed => _zsh_goto_sed | 0 label | 13 ++++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) rename _sed => _zsh_goto_sed (100%) diff --git a/_sed b/_zsh_goto_sed similarity index 100% rename from _sed rename to _zsh_goto_sed diff --git a/label b/label index 214139c..7f57df8 100755 --- a/label +++ b/label @@ -1,5 +1,7 @@ #!/usr/bin/env zsh +set -ex + : "${1:=--help}" case "$1" in @@ -15,20 +17,21 @@ EOF add) label rm "$2" - _sed -i '' -e '$a\' `_goto_file` # Fix potentially missing last newline - printf '%s %s\n' "${1}" $(echo "$2" | _sed "s^${HOME}^~^g") >> `_goto_file` + _zsh_goto_sed -i '/^$/d' "$(_goto_file)" # Remove empty lines + _zsh_goto_sed -i -e '$a\' "$(_goto_file)" # Fix potentially missing last newline + printf '%s %s\n' "${1}" $(echo "$2" | _zsh_goto_sed "s^${HOME}^~^g") >> "$(_goto_file)" ;; get) - realpath "$(_awk "/^$2\s/ {print \$2;exit}" `_goto_file` | _sed "s|^~|$HOME|")" + realpath "$(_awk "/^$2\s/ {print \$2;exit}" `_goto_file` | _zsh_goto_sed "s|^~|$HOME|")" ;; rm) - _sed -i "^$2^d" `_goto_file` + _zsh_goto_sed -i "/$2/d" "$(_goto_file)" ;; ls) - _awk '{print $1;}' `_goto_file` + _awk '{print $1;}' "$(_goto_file)" ;; *)