Changes between Version 79 and Version 80 of Migration

Timestamp:

Dec 15, 2014, 3:37:11 AM (9 years ago)

Author:

dave@…

Comment:

Use a single sudo, so only one password is required.

Migration

@@ -24 +24 @@
     # If there is an argument, then don't preserve 'requested' flags.
     function reinstallPorts() {
-      dontPreserveRequestedFlags=$1
+      local -r dontPreserveRequestedFlags=$1
+      set -e
+      # This will fail if xcode-select needs to be run.
+      clang --version
       # Save the list of installed ports.
       port -qv installed > myports.txt
@@ -31 +34 @@
         port echo requested | cut -d ' ' -f 1 > requested.txt
       fi
-      # Uninstall all installed ports.
-      sudo port -f uninstall installed
-      # Clean any partially-completed builds.
-      sudo port clean all
       # Download the restore_ports script.
       curl -O https://svn.macports.org/repository/macports/contrib/restore_ports/restore_ports.tcl
       chmod +x restore_ports.tcl
-      # Change this if your installation is somewhere else.
-      # (There should be a way to get the port command to report this.)
-      MACPORTS_HOME=/opt/local
-      # Execute the restore_ports script.
-      sudo ./restore_ports.tcl -p $MACPORTS_HOME myports.txt
-      if [[ ! $dontPreserveRequestedFlags ]] ; then
-        sudo port unsetrequested installed
-        < requested.txt xargs sudo port setrequested
-      fi
+      sudo bash << EOF
+        # Start with the latest data.
+        port selfupdate
+        # Uninstall all installed ports.
+        port -f uninstall installed
+        # Clean any partially-completed builds.
+        port clean all
+        # Change this if your installation is somewhere else.
+        # (There should be a way to get the port command to report this.)
+        MACPORTS_HOME=/opt/local
+        # Execute the restore_ports script.
+        ./restore_ports.tcl -p $MACPORTS_HOME myports.txt
+        if [[ ! $dontPreserveRequestedFlags ]] ; then
+          port unsetrequested installed
+          < requested.txt xargs port setrequested
+        fi
+      EOF
     }
     }}}