<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/6d01ed71b9a38eede2eee637fe696b8feac17c75">https://github.com/macports/macports-base/commit/6d01ed71b9a38eede2eee637fe696b8feac17c75</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6d01ed71b9a38eede2eee637fe696b8feac17c75
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Feb 15 08:11:42 2018 +1100
<span style='display:block; white-space:pre;color:#404040;'> remove extra whitespace
</span>---
src/port1.0/portstartupitem.tcl | 70 ++++++++++++++++++++---------------------
1 file changed, 35 insertions(+), 35 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portstartupitem.tcl b/src/port1.0/portstartupitem.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index d6b1847..401a468 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portstartupitem.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portstartupitem.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@
</span> # 3. Neither the name of The MacPorts Project nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span> # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,7 +114,7 @@ proc portstartupitem::startupitem_create_darwin_launchd {args} {
</span> startupitem.install startupitem.autostart startupitem.debug
set scriptdir ${prefix}/etc/startup
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set itemname ${startupitem.name}
set uniquename ${startupitem.uniquename}
set plistname ${startupitem.plist}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,37 +124,37 @@ proc portstartupitem::startupitem_create_darwin_launchd {args} {
</span> "${prefix}/bin/daemondo" \
"--label=${itemname}" \
]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> file mkdir ${destroot}${itemdir}
if {[getuid] == 0} {
file attributes ${destroot}${itemdir} -owner root -group wheel
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [llength ${startupitem.executable}] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[llength ${startupitem.executable}] &&
</span> ![llength ${startupitem.init}] &&
![llength ${startupitem.start}] &&
![llength ${startupitem.stop}] &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ![llength ${startupitem.restart}] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![llength ${startupitem.restart}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # An executable is specified, and there is no init, start, stop, or restart
# code; so we don't need a wrapper script
set args [concat $args "--start-cmd" ${startupitem.executable} ";"]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # No executable was specified, or there was an init, start, stop, or restart
# option, so we do need a wrapper script
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set wrappername ${itemname}.wrapper
set wrapper "${itemdir}/${wrappername}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ![llength ${startupitem.start}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![llength ${startupitem.start}]} {
</span> set startupitem.start [list "sh ${scriptdir}/${subport}.sh start"]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ![llength ${startupitem.stop}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![llength ${startupitem.stop}]} {
</span> set startupitem.stop [list "sh ${scriptdir}/${subport}.sh stop"]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ![llength ${startupitem.restart}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![llength ${startupitem.restart}]} {
</span> set startupitem.restart [list Stop Start]
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -174,7 +174,7 @@ proc portstartupitem::startupitem_create_darwin_launchd {args} {
</span> puts ${item} "# MacPorts generated daemondo support script"
puts ${item} "#"
puts ${item} ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> puts ${item} "#"
puts ${item} "# Init"
puts ${item} "#"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -190,7 +190,7 @@ proc portstartupitem::startupitem_create_darwin_launchd {args} {
</span> foreach line ${startupitem.start} { puts ${item} "\t${line}" }
puts ${item} "\}"
puts ${item} ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> puts ${item} "#"
puts ${item} "# Stop"
puts ${item} "#"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -199,7 +199,7 @@ proc portstartupitem::startupitem_create_darwin_launchd {args} {
</span> foreach line ${startupitem.stop} { puts ${item} "\t${line}" }
puts ${item} "\}"
puts ${item} ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> puts ${item} "#"
puts ${item} "# Restart"
puts ${item} "#"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -231,16 +231,16 @@ proc portstartupitem::startupitem_create_darwin_launchd {args} {
</span>
close ${item}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[tbool startupitem.netchange]} {
lappend args "--restart-netchange"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # To log events then tell daemondo to log at verbosity=n
if {[tbool startupitem.logevents]} {
lappend args "--verbosity=[option startupitem.daemondo.verbosity]"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # If pidfile was specified, translate it for daemondo.
#
# There are four cases:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -250,7 +250,7 @@ proc portstartupitem::startupitem_create_darwin_launchd {args} {
</span> # (4) manual [pidfilename]
#
set pidfileArgCnt [llength ${startupitem.pidfile}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${pidfileArgCnt} > 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${pidfileArgCnt} > 0} {
</span> if { $pidfileArgCnt == 1 } {
set pidFile "${prefix}/var/run/${itemname}.pid"
lappend destroot.keepdirs "${destroot}${prefix}/var/run"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -258,10 +258,10 @@ proc portstartupitem::startupitem_create_darwin_launchd {args} {
</span> set pidFile [lindex ${startupitem.pidfile} 1]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${pidfileArgCnt} > 2 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${pidfileArgCnt} > 2} {
</span> ui_error "$UI_PREFIX [msgcat::mc "Invalid parameter count to startupitem.pidfile: 2 expected, %d found" ${pidfileArgCnt}]"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Translate into appropriate arguments to daemondo
set pidStyle [lindex ${startupitem.pidfile} 0]
switch ${pidStyle} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -274,37 +274,37 @@ proc portstartupitem::startupitem_create_darwin_launchd {args} {
</span> }
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [llength ${startupitem.executable}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[llength ${startupitem.executable}]} {
</span> lappend args "--pid=exec"
} else {
lappend args "--pid=none"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Create the plist file
set plist [open "${destroot}${itemdir}/${plistname}" w 0644]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> puts ${plist} "<?xml version='1.0' encoding='UTF-8'?>"
puts ${plist} "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\""
puts ${plist} "\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\" >"
puts ${plist} "<plist version='1.0'>"
puts ${plist} "<dict>"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> puts ${plist} "<key>Label</key><string>${uniquename}</string>"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> puts ${plist} "<key>ProgramArguments</key>"
puts ${plist} "<array>"
foreach arg ${args} { puts ${plist} "\t<string>${arg}</string>" }
puts ${plist} "</array>"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> puts ${plist} "<key>Disabled</key><true/>"
if {$macosx_deployment_target ne "10.4"} {
puts ${plist} "<key>KeepAlive</key><true/>"
} else {
puts ${plist} "<key>OnDemand</key><false/>"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [llength ${startupitem.logfile}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[llength ${startupitem.logfile}]} {
</span> puts ${plist} "<key>StandardOutPath</key><string>${startupitem.logfile}</string>"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -317,8 +317,8 @@ proc portstartupitem::startupitem_create_darwin_launchd {args} {
</span>
close ${plist}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [getuid] == 0 &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${startupitem.install} ne "no" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[getuid] == 0 &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${startupitem.install} ne "no"} {
</span> file mkdir "${destroot}/Library/${daemondest}"
ln -sf "${itemdir}/${plistname}" "${destroot}/Library/${daemondest}"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -347,9 +347,9 @@ proc portstartupitem::startupitem_create_darwin_launchd {args} {
</span>
proc portstartupitem::startupitem_create {args} {
global UI_PREFIX startupitem.type os.platform
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set startupitem.type [string tolower ${startupitem.type}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Calculate a default value for startupitem.type
if {${startupitem.type} eq "default" || ${startupitem.type} eq ""} {
switch -exact ${os.platform} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -362,7 +362,7 @@ proc portstartupitem::startupitem_create {args} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${startupitem.type} eq "none" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${startupitem.type} eq "none"} {
</span> ui_notice "$UI_PREFIX [msgcat::mc "Skipping creation of control script"]"
} else {
ui_notice "$UI_PREFIX [msgcat::mc "Creating ${startupitem.type} control script"]"
</pre><pre style='margin:0'>
</pre>