updated executable, covering the messy commandline parsing

2 files changed, 33 insertions, 35 deletions

diff --git a/executable b/executable
index b94f6ca6cc1f..92295695e42a 100644..100755
--- a/executable
+++ b/executable
@@ -1,2 +1,34 @@
 #!/bin/bash
-sudo java -jar /usr/share/pseucoco/pseucoco-2.3.jar $@
+function helppage {
+    echo "Usage: $(basename $0) [OPTION] <filename>"
+    echo ""
+    echo " -h, --help          Display this help and exit"
+    echo " -v, --version       Display the pseucoco version and exit"
+    
+}
+function pseucoco {
+    sudo java -jar /usr/share/pseucoco/pseucoco-2.3.jar $@
+}
+
+if [ $# -gt 1 ]
+then
+    helppage
+elif [ $# -lt 1 ]
+then
+    pseucoco
+else
+    if [[ "$1" == "-h" || "$1" == "--help" ]]
+    then
+        helppage
+    elif [[ "$1" == "-v" || "$1" == "--version" ]]
+    then
+        pseucoco -version
+    else
+        if [[ -e $1 ]]
+        then
+            pseucoco -i $1
+        else
+            echo "Error: File \"$1\" not found."
+        fi
+    fi
+fi
diff --git a/test b/test
deleted file mode 100755
index 79a239b1b773..000000000000
--- a/test
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-function helppage {
-    echo "Usage: $0 [OPTION] <filename>"
-    echo ""
-    echo " -h, --help          Display this help and exit"
-    echo " -v, --version       Display the pseucoco version and exit"
-    
-}
-function pseucoco {
-    sudo java -jar /usr/share/pseucoco/pseucoco-2.3.jar $@
-}
-
-if [ $# -gt 1 ]
-thenaa
-    helppage
-elif [ $# -lt 1 ]
-then
-    pseucoco
-else
-    if [[ "$1" == "-h" || "$1" == "--help" ]]
-    then
-        helppage
-    elif [[ "$1" == "-v" || "$1" == "--version" ]]
-    then
-        pseucoco -version
-    else
-        if [[ -e $1 ]]
-        then
-            pseucoco -i $1
-        else
-            echo "Error: File \"$1\" not found."
-        fi
-    fi
-fi