epm play: refactoring

bin/epm-play

@@ -340,20 +340,8 @@ __epm_play_install()
    return $RES
 }
 
-
-epm_play()
+__epm_play_initialize_ipfs()
 {
-[ "$EPMMODE" = "package" -o "$EPMMODE" = "git" ] || fatal "epm play is not supported in single file mode"
-local psdir="$(realpath $CONFIGDIR/play.d)"
-local prsdir="$(realpath $CONFIGDIR/prescription.d)"
-
-if [ "$1" = "-h" ] || [ "$1" = "--help" ] ; then
-    epm_play_help
-    exit
-fi
-
-if [ "$1" = "--ipfs" ]  ; then
-    shift
     if [ -d "$(dirname "$epm_ipfs_db")" ] ; then
         export EGET_IPFS_DB="$eget_ipfs_db"
         if [ ! -r "$EGET_IPFS_DB" ] ; then
@@ -367,17 +355,40 @@ if [ "$1" = "--ipfs" ]  ; then
     else
         warning "ipfs db dir $eget_ipfs_db is not exists, skipping --ipfs"
     fi
+}
+
+epm_play()
+{
+[ "$EPMMODE" = "package" -o "$EPMMODE" = "git" ] || fatal "epm play is not supported in single file mode"
+local psdir="$(realpath $CONFIGDIR/play.d)"
+local prsdir="$(realpath $CONFIGDIR/prescription.d)"
+
+if [ -z "$1" ] ; then
+    [ -n "$short" ] || [ -n "$quiet" ] || echo "Available applications (for current arch $($DISTRVENDOR -a)):"
+    __epm_play_list $psdir
+    exit
 fi
 
 
-if [ "$1" = "--remove" ] || [ "$1" = "remove" ]  ; then
+while [ -n "$1" ] ; do
+case "$1" in
+    -h|--help)
+        epm_play_help
+        exit
+        ;;
+
+    --ipfs)
+        shift
+        __epm_play_initialize_ipfs
+        ;;
+
+    --remove|remove)
         shift
         __epm_play_remove "$@"
         exit
-fi
-
+        ;;
 
-if [ "$1" = "--update" ] ; then
+    --update)
         shift
         local CMDUPDATE="--update"
         [ -n "$force" ] && CMDUPDATE="--run"
@@ -396,44 +407,36 @@ if [ "$1" = "--update" ] ; then
 
         __epm_play_update $CMDUPDATE $list
         exit
+        ;;
 
-fi
-
-if [ "$1" = "--installed" ] || [ "$1" = "installed" ]  ; then
+    --installed|installed)
         shift
         __is_app_installed "$1" "$2"
         #[ -n "$quiet" ] && exit
         exit
-fi
+        ;;
 
-case "$1" in
     # internal options
-    "--installed-version"|"--package-name"|"--product-alternatives")
+    --installed-version|--package-name|--product-alternatives|--info)
         __run_script "$2" "$1" "$3"
         exit
         ;;
-    "--list-installed-packages")
+    --list-installed-packages)
         __list_installed_packages
         exit
         ;;
-    "--list"|"--list-installed"|"list"|"list-installed")
+    --list|--list-installed|list|list-installed)
         __epm_play_list_installed
         exit
         ;;
-    # internal options
-    "--help"|"help")
-        __run_script "$2" "$1" "$3"
-        exit
-        ;;
-esac
 
-if [ "$1" = "--full-list-all" ] ; then
+    --full-list-all)
         [ -n "$short" ] || [ -n "$quiet" ] || echo "Available applications (for current arch $($DISTRVENDOR -a)):"
         __epm_play_list $psdir extra
         exit
-fi
+        ;;
 
-if [ "$1" = "--list-all" ] || [ "$1" = "list-all" ] || [ -z "$*" ] ; then
+    --list-all|list-all)
         [ -n "$short" ] || [ -n "$quiet" ] || echo "Available applications (for current arch $($DISTRVENDOR -a)):"
         __epm_play_list $psdir
         [ -n "$quiet" ] || [ -n "$*" ] && exit
@@ -441,13 +444,22 @@ if [ "$1" = "--list-all" ] || [ "$1" = "list-all" ] || [ -z "$*" ] ; then
         #echo "Run epm play --help for help"
         epm_play_help
         exit
-fi
+        ;;
 
-if [ "$1" = "--list-scripts" ] || [ "$1" = "list-scripts" ] ; then
+    --list-scripts|list-scripts)
         [ -n "$short" ] || [ -n "$quiet" ] || echo "Run with a name of a play script to run:"
         __epm_play_list $prsdir
         exit
-fi
+        ;;
+    -*)
+        fatal "Unknown option $1"
+        ;;
+     *)
+        break
+        ;;
+esac
+shift
+done
 
 __epm_play_install $(echo "$*" | sed -e 's|=| = |g')
 }

play.d/common.sh

@@ -68,12 +68,13 @@ case "$1" in
         epm remove $PKGNAME
         exit
         ;;
-    "--help")
+    "--info")
         if [ -n "$PRODUCTALT" ] ; then
             echo "Help about additional parameters."
-            echo "Use epm play $(basename $0 .sh) [$(echo "$PRODUCTALT" | sed -e 's@ @|@g')]"
+            echo "Use epm play $(basename $0 .sh) [= $(echo "$PRODUCTALT" | sed -e 's@ @|@g')]"
         fi
         [ -n "$TIPS" ] && echo "$TIPS"
+        [ -n "$URL" ] && echo "Url: $URL"
         exit
         ;;
     "--package-name")