mac_install getexp_url

diff --git a/etc/profile.d/functions b/etc/profile.d/functions
index da93199d41ef5cc36e4e3dbc16d419820449c88c..ff86da5e7ec66e71e1772721a813e4f63bf635ec 100644 (file)
--- a/etc/profile.d/functions
+++ b/etc/profile.d/functions
@@ -241,6 +241,8 @@ getexp() {
   return
 }
 
+getexp_url() { curl -ks "$2" | perl -ne 'm,('$1'), and print $1 and exit'; }
+
 radio_play() {
   local prog=`which mplayer`
   if [ -z "$prog" ]; then

diff --git a/etc/profile.d/mac.sh b/etc/profile.d/mac.sh
index f6b900a38552100cde2d1ba28964ba3152130391..de5b50f4e973f7af5553a03d23b4d86f51e6d26f 100644 (file)
--- a/etc/profile.d/mac.sh
+++ b/etc/profile.d/mac.sh
@@ -98,10 +98,11 @@ mac_install() {
   # Aliases
   case "$prg" in
     docker) prg="https://download.docker.com/mac/stable/Docker.dmg" ;;
-    virtualbox) prg=$(perl -MLWP::Simple -e '$_=get($ARGV[0]);m,(https?://download.virtualbox.org/virtualbox/[^"\s]+dmg), and print "$1"' https://www.virtualbox.org/wiki/Downloads) ;;
-    macport) prg=$(curl -ks https://www.macports.org/install.php | perl -ne 'm,(https?://distfiles.macports.org/MacPorts/MacPorts[^"\s]+pkg), and print "$1" and exit')
+    virtualbox) prg=$(getexp_url 'https?://download.virtualbox.org/virtualbox/[^"\s]+dmg' https://www.virtualbox.org/wiki/Downloads) ;;
+    macport) prg=$(getexp_url 'https?://distfiles.macports.org/MacPorts/MacPorts[^"\s]+pkg' https://www.macports.org/install.php) ;;
   esac
 
+  #echo ">$prg"; return
   # Install
   case "$prg" in
     ""|-h|--help) echo "Usage: $FUNCNAME [docker|virtualbox|DMG|PKG]"; return ;;