From 6e04179a87b4b75c8b60b5f09169e8bdcb482a71 Mon Sep 17 00:00:00 2001
From: Nicolas Boisselier <nico@MacMini.local>
Date: Tue, 8 Nov 2016 21:58:14 +0000
Subject: [PATCH] mac_install getexp_url

---
 etc/profile.d/functions | 2 ++
 etc/profile.d/mac.sh    | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/etc/profile.d/functions b/etc/profile.d/functions
index da93199d..ff86da5e 100644
--- 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 f6b900a3..de5b50f4 100644
--- 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 ;;
-- 
2.47.3