function slash changed to common.sh

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@284 04377dda-e619-0410-9926-eae83683ac58

diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh
index f66e9a7edadb6de10989c2282c90981ed3c1a259..af76cd1ba083b7fca83065b760bedae4a17fa6b3 100644 (file)
--- a/trunk/lib/common.sh
+++ b/trunk/lib/common.sh
@@ -505,3 +505,10 @@ function set_jail_perms {
 
 }
 
+function slash {
+
+  # remove additional slashes
+  echo $1 | sed -e 's/\/\+/\//g'
+
+}
+

diff --git a/trunk/src/lspkg b/trunk/src/lspkg
index 52b808a1618d83aefb1d414bca8726f0ba287cf5..74ed684e58fefd92e03c0cb1548094a9c4b8f5af 100755 (executable)
--- a/trunk/src/lspkg
+++ b/trunk/src/lspkg
@@ -59,6 +59,8 @@ else
     LIST_PKGS=`ls /$ROOT/var/log/packages/ 2> /dev/null`
 fi
 
+LIST_PKGS="`slash $LIST_PKGS`"
+
 case $1 in
     "-h"|"--help")
         usage

diff --git a/trunk/src/templatepkg b/trunk/src/templatepkg
index aba838526612957b39ec463e9418365626ffe427..96c1d704c22bc8ccbb31745f04a0b4816eaad091 100755 (executable)
--- a/trunk/src/templatepkg
+++ b/trunk/src/templatepkg
@@ -665,13 +665,6 @@ function setroot {
 
 }
 
-function slash {
-
-  # remove additional slashes
-  echo $1 | sed -e 's/\/\+/\//g'
-
-}
-
 # -----------------------------------------------------
 #                       main
 # -----------------------------------------------------