Merge pull request #1064 from reitermarkus/migrate-caskroom

Ask for `sudo` when moving Caskroom.
Homebrew · Sep 22, 2016 · c310557 · c310557
2 parents 23efbc5 + 530cee4
commit c310557
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/Library/Homebrew/cask/lib/hbc/caskroom.rb b/Library/Homebrew/cask/lib/hbc/caskroom.rb
@@ -5,7 +5,13 @@ def migrate_caskroom_from_repo_to_prefix
     repo_caskroom = Hbc.homebrew_repository.join("Caskroom")
     if !Hbc.caskroom.exist? && repo_caskroom.directory?
       ohai "Moving Caskroom from HOMEBREW_REPOSITORY to HOMEBREW_PREFIX"
-      FileUtils.mv repo_caskroom, Hbc.caskroom
+
+      if Hbc.caskroom.parent.writable?
+        FileUtils.mv repo_caskroom, Hbc.caskroom
+      else
+        opoo "#{Hbc.caskroom.parent} is not writable, sudo is needed to move the Caskroom."
+        system "/usr/bin/sudo", "--", "/bin/mv", "--", repo_caskroom.to_s, Hbc.caskroom.parent.to_s
+      end
     end
   end