5 files changed, 15 insertions, 13 deletions
diff --git a/rvs/plugins/files/bin/blob-gethash.sh b/rvs/plugins/files/bin/blob-gethash.sh
index b790d28..74defbc 100644
--- a/rvs/plugins/files/bin/blob-gethash.sh
+++ b/rvs/plugins/files/bin/blob-gethash.sh
@@ -22,5 +22,5 @@ ver=0.9
 usage="ID"
 id="`getvar "$1"`"
 
-echo $id | sed 's:.*/::'
+echo $id | sed 's/.*://'
 
diff --git a/rvs/plugins/files/bin/blob-gettype.sh b/rvs/plugins/files/bin/blob-gettype.sh
index 3378506..da3ee2a 100644
--- a/rvs/plugins/files/bin/blob-gettype.sh
+++ b/rvs/plugins/files/bin/blob-gettype.sh
@@ -22,5 +22,5 @@ ver=0.9
 usage="ID"
 id="`getvar "$1"`"
 
-echo $id | sed 's:/.*::'
+echo $id | sed 's/:.*//'
 
diff --git a/rvs/plugins/files/bin/commit.f.sh b/rvs/plugins/files/bin/commit.f.sh
index c27005b..e0df1b2 100644
--- a/rvs/plugins/files/bin/commit.f.sh
+++ b/rvs/plugins/files/bin/commit.f.sh
@@ -19,14 +19,14 @@ ver=0.9
 
 . "$LIBDIR/@ID@/stdio"
 
-usage="FILENAME [PREFIX]"
+usage="FILENAME [TYPE]"
 file="`getvar "$1"`"
 prefix="${2-f}"
 
 hash=`sha1sum $file | sed "s/ .*$//"`
-if [ ! -f "$REPO/@ID@/$prefix/$hash" ]; then
-	mkdir -p "$REPO/@ID@/$prefix"
-	install -m 644 -o $USER -g $USER -T "$file" "$REPO/@ID@/$prefix/$hash"
+if [ ! -f "$REPO/@ID@/$hash" ]; then
+	mkdir -p "$REPO/@ID@/"
+	install -m 644 -o $USER -g $USER -T "$file" "$REPO/@ID@/$hash"
 fi
-echo "$prefix/$hash"
+echo "$prefix:$hash"
 
diff --git a/rvs/plugins/files/bin/get.f.sh b/rvs/plugins/files/bin/get.f.sh
index 00508ab..e3d5edc 100644
--- a/rvs/plugins/files/bin/get.f.sh
+++ b/rvs/plugins/files/bin/get.f.sh
@@ -23,5 +23,7 @@ usage="FILENAME ID"
 name="`getvar "$1"`"
   id="`getvar "$2"`"
 
-install -T "$REPO/@ID@/$id" "$name"
+hash="`"$RVS" blob-gethash "$id"`"
+
+install -T "$REPO/@ID@/$hash" "$name"
 
diff --git a/rvs/plugins/files/bin/ls.sh b/rvs/plugins/files/bin/ls.sh
index ae225cf..9e586eb 100644
--- a/rvs/plugins/files/bin/ls.sh
+++ b/rvs/plugins/files/bin/ls.sh
@@ -41,10 +41,10 @@ while read line; do
 	n="`echo "$line" | cut -f5-`"
 	echo "$form" | sed \
 		-e 's:\\t:\t:g' \
-		-e "s:%p:${p/':'/'\:'}:g" \
-		-e "s:%o:${o/':'/'\:'}:g" \
-		-e "s:%g:${g/':'/'\:'}:g" \
-		-e "s:%i:${i/':'/'\:'}:g" \
-		-e "s:%n:${n/':'/'\:'}:g"
+		-e "s:%p:${p/:/\\:}:g" \
+		-e "s:%o:${o/:/\\:}:g" \
+		-e "s:%g:${g/:/\\:}:g" \
+		-e "s:%i:${i/:/\\:}:g" \
+		-e "s:%n:${n/:/\\:}:g"
 done < "$tmp"