Merge pull request #21649 from vitorgalvao/fix-staged-path

Casks/alice.rb

@@ -10,6 +10,6 @@ cask 'alice' do
   app 'Alice.app'
 
   caveats do
-    path_environment_variable("#{staged_path}/Alice.app/Contents/Resources/bin")
+    path_environment_variable("#{appdir}/Alice.app/Contents/Resources/bin")
   end
 end

Casks/cmpl.rb

@@ -7,14 +7,13 @@ cask 'cmpl' do
   homepage 'http://www.coliop.org/'
   license :gpl
 
-  # linking into ~/Applications breaks Cmpl, due to hardcoded paths
-  suite 'Cmpl', target: '/Applications/Cmpl'
+  suite 'Cmpl'
   binary 'Cmpl/bin/cmpl'
   binary 'Cmpl/coliop'
   binary 'Cmpl/pyCmpl/scripts/Unix/cmplServer'
   binary 'Cmpl/pyCmpl/scripts/Unix/pyCmpl'
 
   postflight do
-    system '/bin/rm', '-f', '--', "#{staged_path}/Cmpl/install", "#{staged_path}/Cmpl/deinstall"
+    system '/bin/rm', '-f', '--', "#{appdir}/Cmpl/install", "#{appdir}/Cmpl/deinstall"
   end
 end

Casks/dia.rb

@@ -13,6 +13,6 @@ cask 'dia' do
   app 'Dia.app'
 
   postflight do
-    system '/usr/bin/sed', '-i', '--', 's/exec/exec env DISPLAY=:0/g', "#{staged_path}/Dia.app/Contents/Resources/bin/dia"
+    system '/usr/bin/sed', '-i', '--', 's/exec/exec env DISPLAY=:0/g', "#{appdir}/Dia.app/Contents/Resources/bin/dia"
   end
 end

Casks/fenics.rb

@@ -19,13 +19,13 @@ cask 'fenics' do
       available when you start your shell by adding the following to the .profile
       file in your home directory:
 
-        source #{staged_path}/FEniCS.app/Contents/Resources/share/fenics/fenics.conf
+        source #{appdir}/FEniCS.app/Contents/Resources/share/fenics/fenics.conf
 
       If you are using an alternate shell (e.g., zsh, csh) or a modified or brewed Python,
       be sure to launch FEniCS using a clean (bash) shell.
       Creating a new shell using the following command works well:
 
-        /bin/bash --rcfile #{staged_path}/FEniCS.app/Contents/Resources/share/fenics/fenics.conf
+        /bin/bash --rcfile #{appdir}/FEniCS.app/Contents/Resources/share/fenics/fenics.conf
     EOS
   end
 end

Casks/gedit.rb

@@ -13,6 +13,6 @@ cask 'gedit' do
 
   postflight do
     library = Dir.glob("#{`brew --cellar`.chomp}/libxml2/**/libxml2.2.dylib").first
-    system 'cp', '-f', library, "#{staged_path}/gedit.app/Contents/Resources/lib/"
+    system 'cp', '-f', library, "#{appdir}/gedit.app/Contents/Resources/lib/"
   end
 end

Casks/gnubg.rb

@@ -29,9 +29,6 @@ cask 'gnubg' do
     <<-EOS.undent
       #{token} only works if called from /Applications, so you may need to install it with
         brew cask --appdir=/Applications install #{token}
-
-      Alternatively, you can create a symbolic link in /Applications after installing and upgrading:
-        ln -sf '#{staged_path}/gnubg.app' '/Applications/gnubg.app'
     EOS
   end
 end

Casks/hex-fiend.rb

@@ -13,7 +13,7 @@ cask 'hex-fiend' do
   app 'Hex Fiend.app'
 
   postflight do
-    set_permissions "#{staged_path}/Hex Fiend.app/Contents/Frameworks/Sparkle.framework", 'og=u'
+    set_permissions "#{appdir}/Hex Fiend.app/Contents/Frameworks/Sparkle.framework", 'og=u'
   end
 
   zap delete: [

Casks/jabber-video.rb

@@ -13,7 +13,7 @@ cask 'jabber-video' do
     # Remove ForcedConfig.plist from App bundle. This plist prevents us from editing the internal, external servers and Sip domain
     # See Cisco Jabber Video for Telepresence 4.8 Administrator Guide for more details
     # https://www.cisco.com/c/en/us/td/docs/telepresence/endpoint/Jabber_Video/4_8/CJAB_BK_J4DBC2E7_00_jabber-video-admin-guide-4-8/CJAB_BK_J4DBC2E7_00_jabber-video-admin-guide-4-8_chapter_011.html#CJAB_TP_P465596C_00
-    system '/bin/rm', '--', "#{staged_path}/Jabber Video.app/Contents/Resources/ForcedConfig.plist"
+    system '/bin/rm', '--', "#{appdir}/Jabber Video.app/Contents/Resources/ForcedConfig.plist"
   end
 
   zap delete: [
@@ -22,5 +22,5 @@ cask 'jabber-video' do
                 '~/Library/Application Support/Jabber Video',
                 '~/Library/Logs/Jabber Video',
               ],
-      script: 'Jabber Video.app/Contents/SharedSupport/remove_user_data.sh'
+      script: "#{appdir}/Jabber Video.app/Contents/SharedSupport/remove_user_data.sh"
 end

Casks/jxplorer.rb

@@ -11,6 +11,6 @@ cask 'jxplorer' do
   app "jxplorer-#{version}.app"
 
   postflight do
-    set_permissions "#{staged_path}/jxplorer-#{version}.app/Contents/MacOS/jxplorer", 'a+x'
+    set_permissions "#{appdir}/jxplorer-#{version}.app/Contents/MacOS/jxplorer", 'a+x'
   end
 end

Casks/megasync.rb

@@ -13,9 +13,6 @@ cask 'megasync' do
     <<-EOS.undent
       #{token} only works if called from /Applications, so you may need to install it with
         brew cask install --appdir=/Applications #{token}
-
-      Alternatively, you can create an extra link in /Applications, after installing
-        ln -s '#{staged_path}/MEGAsync.app' '/Applications/MEGAsync.app'
     EOS
   end
 end

Casks/meshlab.rb

@@ -11,7 +11,7 @@ cask 'meshlab' do
 
   postflight do
     # workaround for bug which breaks the app on case-sensitive filesystems
-    Dir.chdir("#{staged_path}/meshlab.app/Contents/MacOS") do
+    Dir.chdir("#{appdir}/meshlab.app/Contents/MacOS") do
       File.symlink('meshlab', 'MeshLab') unless File.exist? 'MeshLab'
     end
   end

Casks/openarena.rb

@@ -10,6 +10,6 @@ cask 'openarena' do
   app "openarena-#{version}/OpenArena.app"
 
   postflight do
-    set_permissions "#{staged_path}/openarena-#{version}/OpenArena.app/Contents/MacOS/openarena.ub", '755'
+    set_permissions "#{appdir}/OpenArena.app/Contents/MacOS/openarena.ub", '755'
   end
 end

Casks/pd-extended.rb

@@ -11,6 +11,6 @@ cask 'pd-extended' do
   app 'Pd-extended.app'
 
   postflight do
-    set_permissions "#{staged_path}/Pd-extended.app", 'u+w'
+    set_permissions "#{appdir}/Pd-extended.app", 'u+w'
   end
 end

Casks/pd.rb

@@ -10,6 +10,6 @@ cask 'pd' do
   app "Pd-#{version}-64bit.app"
 
   postflight do
-    set_permissions "#{staged_path}/Pd-#{version}-64bit.app", 'u+w'
+    set_permissions "#{appdir}/Pd-#{version}-64bit.app", 'u+w'
   end
 end

Casks/vmware-fusion.rb

@@ -36,7 +36,7 @@ cask 'vmware-fusion' do
   binary "#{appdir}/VMware Fusion.app/Contents/Library/VMware OVF Tool/ovftool"
 
   uninstall_preflight do
-    set_ownership "#{staged_path}/VMware Fusion.app"
+    set_ownership "#{appdir}/VMware Fusion.app"
   end
 
   zap delete: [

Casks/voicemac.rb

@@ -12,6 +12,6 @@ cask 'voicemac' do
   app 'VoiceMac/VoiceMac.app'
 
   postflight do
-    set_permissions "#{staged_path}/VoiceMac/VoiceMac.app/Contents/Info.plist", 'a+r'
+    set_permissions "#{appdir}/VoiceMac.app/Contents/Info.plist", 'a+r'
   end
 end