Commit Graph

15 Commits

Author SHA1 Message Date
twangboy
f33395f1ee Fix logic in /etc/paths.d/salt detection 2017-09-15 13:41:23 -06:00
rallytime
328dd6aa23 Merge branch '2016.11' into '2017.7'
Conflicts:
  - pkg/osx/pkg-scripts/postinstall
  - pkg/osx/pkg-scripts/preinstall
2017-08-22 09:38:33 -04:00
twangboy
ef8a14cdf9 Remove /opt/salt instead of /opt/salt/bin 2017-08-18 12:19:04 -06:00
twangboy
2dd62aa1da Add more information to the description 2017-08-18 12:09:08 -06:00
twangboy
f44f5b70dc Only stop services if they are running
Otherwise it will cause an error and the installation will fail
2017-08-18 11:52:34 -06:00
twangboy
3b62bf953c Remove salt from the path 2017-08-18 11:44:35 -06:00
twangboy
ebdca3a0f5 Update pkg-scripts
Improves logging
Removes /opt/salt/bin directory before install
Removes symlink to salt-config before install
2017-08-18 11:25:32 -06:00
rallytime
9ad362fbde Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/states/kapacitor.py
2017-01-03 10:17:18 -05:00
twangboy
e96bfe8fa2 Change OSX/OS X to macOS where possible 2016-12-28 14:49:46 -07:00
David Cournapeau
dcc52ba08a BUG: fix copypasta in preinstall script. 2016-11-24 14:53:04 +00:00
David Cournapeau
6c55e1e7fa Revert "REF: use a variable to reference the pre/post install script output on OS X installer."
This reverts commit 7180e5ec21.
2016-11-24 14:52:03 +00:00
David Cournapeau
7180e5ec21 REF: use a variable to reference the pre/post install script output on OS X installer. 2016-11-23 11:48:18 +00:00
David Cournapeau
4265da7b53 BUG: use -w option when unloading salt minion launchd script. 2016-11-23 11:39:30 +00:00
David Cournapeau
0e8cf75680 FEAT: put back support for Maverick in OS X installer.
As launchctl CLI interface changed on Yosemite, we execute the more
recent code for Yosemite and later, and introduced back the old code for
post/pre install scripts when running on Maverick.

Tested on Maverick (10.9.5).
2016-11-23 11:34:42 +00:00
Clayton Burlison
b483d1d8a6 Update mac native package for upcoming release
This solves an issue where the package `resources` and package `scripts` were being added to the root of the install drive.

Change Spelling for:
* xCode to XCode
* and capitalize Command Line Tools

to match Apple's offical documentation.

Ref: https://developer.apple.com/xcode/
and https://developer.apple.com/library/ios/technotes/tn2339/_index.html
2016-06-01 23:32:23 -05:00