Skip to content
This repository has been archived by the owner on Jul 4, 2023. It is now read-only.

Commit

Permalink
Minor cleanup on plist caveats.
Browse files Browse the repository at this point in the history
Use basename to refer to plist file when loaded. Make cp lines same
across formulas.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
  • Loading branch information
lewinski authored and adamv committed Feb 4, 2012
1 parent c86610b commit c2b8e87
Show file tree
Hide file tree
Showing 14 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion Library/Formula/elasticsearch.rb
Expand Up @@ -59,7 +59,7 @@ def caveats
ln -nfs #{plist_path} ~/Library/LaunchAgents/
launchctl load -wF ~/Library/LaunchAgents/#{plist_path.basename}
If this is an upgrade and you already have the #{plist_path} loaded:
If this is an upgrade and you already have the #{plist_path.basename} loaded:
launchctl unload -w ~/Library/LaunchAgents/#{plist_path.basename}
ln -nfs #{plist_path} ~/Library/LaunchAgents/
launchctl load -wF ~/Library/LaunchAgents/#{plist_path.basename}
Expand Down
2 changes: 1 addition & 1 deletion Library/Formula/gearman.rb
Expand Up @@ -23,7 +23,7 @@ def caveats
cp #{plist_path} ~/Library/LaunchAgents/
launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
If this is an upgrade and you already have the #{plist_path} loaded:
If this is an upgrade and you already have the #{plist_path.basename} loaded:
launchctl unload -w ~/Library/LaunchAgents/#{plist_path.basename}
cp #{plist_path} ~/Library/LaunchAgents/
launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
Expand Down
2 changes: 1 addition & 1 deletion Library/Formula/jenkins.rb
Expand Up @@ -20,7 +20,7 @@ def caveats; <<-EOS
cp #{plist_path} ~/Library/LaunchAgents/
launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
If this is an upgrade and you already have the #{plist_path} loaded:
If this is an upgrade and you already have the #{plist_path.basename} loaded:
launchctl unload -w ~/Library/LaunchAgents/#{plist_path.basename}
cp #{plist_path} ~/Library/LaunchAgents/
launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
Expand Down
8 changes: 4 additions & 4 deletions Library/Formula/mariadb.rb
Expand Up @@ -75,16 +75,16 @@ def caveats; <<-EOS.undent
mysql_install_db
If this is your first install, automatically load on login with:
cp #{plist_path} ~/Library/LaunchAgents
cp #{plist_path} ~/Library/LaunchAgents/
launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
If this is an upgrade and you already have the #{plist_path} loaded:
If this is an upgrade and you already have the #{plist_path.basename} loaded:
launchctl unload -w ~/Library/LaunchAgents/#{plist_path.basename}
cp #{plist_path} ~/Library/LaunchAgents
cp #{plist_path} ~/Library/LaunchAgents/
launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
Note on upgrading:
We overwrite any existing #{plist_path} in ~/Library/LaunchAgents
We overwrite any existing #{plist_path.basename} in ~/Library/LaunchAgents
if we are upgrading because previous versions of this brew created the
plist with a version specific program argument.
Expand Down
4 changes: 2 additions & 2 deletions Library/Formula/memcached.rb
Expand Up @@ -32,9 +32,9 @@ def caveats; <<-EOS.undent
cp #{plist_path} ~/Library/LaunchAgents/
launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
If this is an upgrade and you already have the #{plist_path} loaded:
If this is an upgrade and you already have the #{plist_path.basename} loaded:
launchctl unload -w ~/Library/LaunchAgents/#{plist_path.basename}
cp #{plist_path} ~/Library/LaunchAgents/#{plist_path.basename}
cp #{plist_path} ~/Library/LaunchAgents/
launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
Or start it manually:
Expand Down
2 changes: 1 addition & 1 deletion Library/Formula/mongodb.rb
Expand Up @@ -55,7 +55,7 @@ def caveats
cp #{plist_path} ~/Library/LaunchAgents/
launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
If this is an upgrade and you already have the #{plist_path} loaded:
If this is an upgrade and you already have the #{plist_path.basename} loaded:
launchctl unload -w ~/Library/LaunchAgents/#{plist_path.basename}
cp #{plist_path} ~/Library/LaunchAgents/
launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
Expand Down
2 changes: 1 addition & 1 deletion Library/Formula/mysql.rb
Expand Up @@ -124,7 +124,7 @@ def caveats; <<-EOS.undent
cp #{plist_path} ~/Library/LaunchAgents/
launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
* if this is an upgrade and you already have the #{plist_path} loaded:
* if this is an upgrade and you already have the #{plist_path.basename} loaded:
launchctl unload -w ~/Library/LaunchAgents/#{plist_path.basename}
cp #{plist_path} ~/Library/LaunchAgents/
launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
Expand Down
2 changes: 1 addition & 1 deletion Library/Formula/offline-imap.rb
Expand Up @@ -31,7 +31,7 @@ def caveats; <<-EOS.undent
cp #{plist_path} ~/Library/LaunchAgents/
launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
* if this is an upgrade and you already have the #{plist_path} loaded:
* if this is an upgrade and you already have the #{plist_path.basename} loaded:
launchctl unload -w ~/Library/LaunchAgents/#{plist_path.basename}
cp #{plist_path} ~/Library/LaunchAgents/
launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
Expand Down
2 changes: 1 addition & 1 deletion Library/Formula/percona-server.rb
Expand Up @@ -121,7 +121,7 @@ def caveats; <<-EOS.undent
cp #{plist_path} ~/Library/LaunchAgents/
launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
* if this is an upgrade and you already have the #{plist_path} loaded:
* if this is an upgrade and you already have the #{plist_path.basename} loaded:
launchctl unload -w ~/Library/LaunchAgents/#{plist_path.basename}
cp #{plist_path} ~/Library/LaunchAgents/
launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
Expand Down
2 changes: 1 addition & 1 deletion Library/Formula/pgbouncer.rb
Expand Up @@ -34,7 +34,7 @@ def caveats
cp #{plist_path} ~/Library/LaunchAgents/
launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
If this is an upgrade and you already have the #{plist_path}
If this is an upgrade and you already have the #{plist_path.basename}
loaded:
launchctl unload -w ~/Library/LaunchAgents/#{plist_path.basename}
cp #{plist_path} ~/Library/LaunchAgents/
Expand Down
2 changes: 1 addition & 1 deletion Library/Formula/postgresql.rb
Expand Up @@ -117,7 +117,7 @@ def caveats
cp #{plist_path} ~/Library/LaunchAgents/
launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
If this is an upgrade and you already have the #{plist_path} loaded:
If this is an upgrade and you already have the #{plist_path.basename} loaded:
launchctl unload -w ~/Library/LaunchAgents/#{plist_path.basename}
cp #{plist_path} ~/Library/LaunchAgents/
launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
Expand Down
2 changes: 1 addition & 1 deletion Library/Formula/rabbitmq.rb
Expand Up @@ -46,7 +46,7 @@ def caveats
cp #{plist_path} ~/Library/LaunchAgents/
launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
If this is an upgrade and you already have the #{plist_path} loaded:
If this is an upgrade and you already have the #{plist_path.basename} loaded:
launchctl unload -w ~/Library/LaunchAgents/#{plist_path.basename}
cp #{plist_path} ~/Library/LaunchAgents/
launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
Expand Down
2 changes: 1 addition & 1 deletion Library/Formula/redis.rb
Expand Up @@ -41,7 +41,7 @@ def caveats
cp #{plist_path} ~/Library/LaunchAgents/
launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
If this is an upgrade and you already have the #{plist_path} loaded:
If this is an upgrade and you already have the #{plist_path.basename} loaded:
launchctl unload -w ~/Library/LaunchAgents/#{plist_path.basename}
cp #{plist_path} ~/Library/LaunchAgents/
launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
Expand Down
2 changes: 1 addition & 1 deletion Library/Formula/selenium-server-standalone.rb
Expand Up @@ -18,7 +18,7 @@ def caveats; <<-EOS
cp "#{plist_path}" ~/Library/LaunchAgents/
launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
If this is an upgrade and you already have the #{plist_path} loaded:
If this is an upgrade and you already have the #{plist_path.basename} loaded:
launchctl unload -w ~/Library/LaunchAgents/#{plist_path.basename}
cp #{plist_path} ~/Library/LaunchAgents/
launchctl load -w ~/Library/LaunchAgents/#{plist_path.basename}
Expand Down

0 comments on commit c2b8e87

Please sign in to comment.