reworked path handling...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>

.pct-helpers

@@ -126,6 +126,18 @@ hostname2ct(){
 }
 
 
+#----------------------------------------------------------------------
+
+normpath(){
+	echo $1 \
+		| sed \
+			-e 's/\/\+/\//g' \
+			-e 's/\/.\//\//g' \
+			-e 's/[^\/]\+\/\.\.//g' \
+			-e 's/\/\+/\//g' \
+			-e 's/\/\.$/\//g'
+}
+
 
 #----------------------------------------------------------------------
 # vim:set ts=4 sw=4 nowrap :

pct-push-r

@@ -34,7 +34,7 @@ to=$3
 
 # get from path relative to working directory...
 if [[ ${from:0:1} != '/' ]] ; then
-	from="$(pwd)/${from}"
+	from="$(normpath "$(pwd)/${from}")"
 fi
 
 
@@ -52,9 +52,11 @@ done
 local files=($(find "$from" -type f))
 for file in "${files[@]}" ; do
 	file=${file#${from}}
+	f=$(normpath "${from}/${file}")
+	t=$(normpath "${to}/${file}")
 	[ $QUIET ] \
-		|| echo "copy: \"${from}/${file}\" -> $id:\"${to}/${file}\""
+		|| echo "copy: \"$f\" -> $id:\"$t\""
-	pct push $id "${from}/${file}" "${to}/${file}"
+	pct push $id "$f" "$t"
 done