rename, improve mac_install

diff --git a/etc/profile.d/mac.sh b/etc/profile.d/mac.sh
index efcd88c754f897cf64379c689d214a5669c91101..9165edcd00f7dabe26a523879e399c484bca7cd7 100644 (file)
--- a/etc/profile.d/mac.sh
+++ b/etc/profile.d/mac.sh
@@ -95,26 +95,25 @@ mac_pkg_list_todel() {
   echo pkgutil --forget "$1"
 }
 
-mac_install_dmg() {
-# NB 17.09.16   local file
-# NB 17.09.16   case "$1" in
-# NB 17.09.16     http*)
-# NB 17.09.16       file=$(mktemp)
-# NB 17.09.16       echo "$file"
-# NB 17.09.16       trap 'rm -f -- "$file"' INT TERM HUP EXIT
-# NB 17.09.16       curl "$1" -o "$file" || return
-# NB 17.09.16     ;;
-# NB 17.09.16     *)
-# NB 17.09.16       file="$1"
-# NB 17.09.16     ;;
-# NB 17.09.16   esac
-  local MOUNTDIR=$(echo `hdiutil mount "$1" | tail -1 | awk '{$1=$2=""; print $0}'` | xargs -0 echo)
-  if [ -z $(ls -d1 "${MOUNTDIR}/"*.pkg 2>/dev/null) ]; then
-    read -p "Can not find *.pkg. Press a key to unmount ${MOUNTDIR}"
-  else
-    sudo installer -verbose -pkg "${MOUNTDIR}/"*.pkg -target /
-  fi
-  sudo hdiutil detach "${MOUNTDIR}"
+mac_install() {
+
+  case "$1" in
+    *.pkg)
+    ;;
+    *)
+      local MOUNTDIR=$(echo `hdiutil mount "$1" | tail -1 | awk '{$1=$2=""; print $0}'` | xargs -0 echo)
+
+      if [[ -n $(find "${MOUNTDIR}" -mindepth 0 -maxdepth 1 -name '*.pkg') ]]; then
+        sudo installer -verbose -pkg "${MOUNTDIR}/"*.pkg -target /
+      elif [[ -n $(find "${MOUNTDIR}" -mindepth 0 -maxdepth 1 -name '*.app') ]]; then
+        sudo cp -rv "${MOUNTDIR}/"*.app /Applications/
+      else
+        read -p "Can not find *.pkg. Press a key to unmount ${MOUNTDIR}"
+      fi
+
+      sudo hdiutil detach "${MOUNTDIR}"
+    ;;
+  esac
 }
 
 mac_pkg_list_files() {