Rename __trashman_ functions to trashman_

1 files changed, 15 insertions, 15 deletions

diff --git a/trashman b/trashman
index 539e15d..34a1247 100755
--- a/trashman
+++ b/trashman
@@ -37,7 +37,7 @@ fi
 . $SHARE/trashman/functions || exit 1
 
 # Display usage
-__trashman_usage() {
+trashman_usage() {
   echo "$BASENAME: package ports tree and heterodox configuration provisioner"
   echo ""
   echo "usage: $BASENAME <fetch|merge>"
@@ -46,9 +46,9 @@ __trashman_usage() {
   echo "available packages:"
   echo ""
 
-  for package in `__trashman_implementations`; do
+  for package in `trashman_implementations`; do
     if [ -e "$SHARE/$package/info" ]; then
-      echo "\t $package: `cat $SHARE/$package/info` (`__trashman_actions $package | sed -e 's/ /|/g'`)"
+      echo "\t $package: `cat $SHARE/$package/info` (`trashman_actions $package | sed -e 's/ /|/g'`)"
     fi
   done
 
@@ -58,13 +58,13 @@ __trashman_usage() {
 
 # Dispatch
 if [ -z "$ACTION" ]; then
-  __trashman_usage
+  trashman_usage
 elif [ "$ACTION" = "fetch" ]; then
-  __trashman_$ACTION
+  trashman_$ACTION
 elif [ "$ACTION" = "merge" ]; then
-  __trashman_$ACTION
+  trashman_$ACTION
 elif [ "$ACTION" = "version" ]; then
-  __trashman_$ACTION
+  trashman_$ACTION
 else
   # Get packages param
   shift
@@ -72,28 +72,28 @@ else
 
   # Setup packages
   if [ -z "$PACKAGES" ]; then
-    __trashman_usage
+    trashman_usage
   else
     for package in $PACKAGES; do
-      if [ ! -z "`__trashman_actions $package`" ]; then
-        folder="`__trashman_actions_folder $package`"
+      if [ ! -z "`trashman_actions $package`" ]; then
+        folder="`trashman_actions_folder $package`"
 
         # Checking for privileges
-        __trashman_check_root $ACTION
+        trashman_check_root $ACTION
 
         if [ -x "$SHARE/$package/$folder/$ACTION" ]; then
           if [ "$ACTION" != "check" ] && [ "$ACTION" != "test" ]; then
-            __trashman_echo "Issuing action $ACTION for $package ($folder)..."
+            trashman_echo "Issuing action $ACTION for $package ($folder)..."
           fi
 
           # Run action for package
           $SHARE/$package/$folder/$ACTION $SHARE
-          __trashman_check_exit_status $ACTION $?
+          trashman_check_exit_status $ACTION $?
         else
-          __trashman_echo "No such action $ACTION for package $package, skipping"
+          trashman_echo "No such action $ACTION for package $package, skipping"
         fi
       else
-        __trashman_echo "No such package $package, skipping"
+        trashman_echo "No such package $package, skipping"
       fi
     done