Implement basename in shell

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 599d1187a899a7513742010da9b0d67c4e0b1ad6..c9c706b06a220435f55f9c579eec2c3cec9d59cb 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -12,6 +12,12 @@
 # which is admittedly extremely unlikely to the point of being impossible,
 # this software will most likely follow suit.
 
 # which is admittedly extremely unlikely to the point of being impossible,
 # this software will most likely follow suit.
 

+basename() {
+       local f; f="${1##*/}"
+       [ -z "$2" ] || f="${f%$2}"
+       echo "$f"
+}
+

 SELF=$(basename $0)
 VERSION='1.2'
 
 SELF=$(basename $0)
 VERSION='1.2'
 


@@ -258,9 +264,9 @@ write_gitignore() {
        tempfile=$(mktemp) || fatal "could not create tempfile" 51
        echo '*' > "$tempfile" || fatal "could not write to '$tempfile'" 57
        for gitignore in $gitignores; do
        tempfile=$(mktemp) || fatal "could not create tempfile" 51
        echo '*' > "$tempfile" || fatal "could not write to '$tempfile'" 57
        for gitignore in $gitignores; do

-               echo "$gitignore" | sed 's/^/!/' >> "$tempfile" || fatal "could not write to '$tempfile'" 57
+               echo "$gitignore" | sed 's@^@!/@' >> "$tempfile" || fatal "could not write to '$tempfile'" 57

                if [ x$VCSH_GITIGNORE = x'recursive' ] && [ -d "$gitignore" ]; then
                if [ x$VCSH_GITIGNORE = x'recursive' ] && [ -d "$gitignore" ]; then

-                       { echo "$gitignore/*" | sed 's/^/!/' >> "$tempfile" || fatal "could not write to '$tempfile'" 57; }
+                       { echo "$gitignore/*" | sed 's@^@!/@' >> "$tempfile" || fatal "could not write to '$tempfile'" 57; }

                fi
        done
        if diff -N "$tempfile" "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" > /dev/null; then
                fi
        done
        if diff -N "$tempfile" "$VCSH_BASE/.gitignore.d/$VCSH_REPO_NAME" > /dev/null; then