mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-04-23 13:29:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into samuel-docs

Browse Source
This commit is contained in:
Samuel Keeley
2015-11-20 14:54:19 -08:00
parent ac39dda439 942e645387
commit 23d2e85545
61 changed files with 115 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/tools/app2pkg.py
+1 -1
View File
@@ -7,7 +7,7 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
code/tools/filelist2pkg.py
+1 -1
View File
@@ -7,7 +7,7 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
code/tools/make_munki_mpkg.sh
+1 -1
View File
@@ -485,7 +485,7 @@ cat > "$DISTFILE" <<EOF
<choice id="app" title="$APPTITLE" description="$APPDESC">
<pkg-ref id="$PKGID.app"/>
</choice>
<choice id="launchd" title="$LAUNCHDTITLE" description="$LAUNCHDDESC" start_selected='system.env.OS_INSTALL == 1 || system.compareVersions(my.target.receiptForIdentifier("$PKGID.launchd").version, "$LAUNCHDVERSION") != 0'>
<choice id="launchd" title="$LAUNCHDTITLE" description="$LAUNCHDDESC" start_selected='my.choice.packageUpgradeAction != "installed"'>
<pkg-ref id="$PKGID.launchd"/>
</choice>
$CONFCHOICE
code/tools/pkginfo_hash_updater.py
+2 -2
View File
@@ -6,7 +6,7 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
@@ -27,7 +27,7 @@ plists before running this script!
Dependencies:
- Linux: Python2.6 or higher, or 2.4/2.5 with python-plistlib manually
installed: http://docs.python.org/library/plistlib.html
installed: https://docs.python.org/library/plistlib.html
- OS X: Python2.4 or higher.
Created on 2010-09-02.
code/tools/tar2pkg.py
+1 -1
View File
@@ -7,7 +7,7 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
code/tools/transcript2pkg.py
+1 -1
View File
@@ -7,7 +7,7 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,