You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by ru...@apache.org on 2019/11/27 14:04:40 UTC

[whimsy] branch master updated (dd261a2 -> fa61413)

This is an automated email from the ASF dual-hosted git repository.

rubys pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


    from dd261a2  Parse svn info output as Hash
     new e7392e8  Make applications restart on change
     new fa61413  disable toucher for docker, depends on listen and hasn't been tested with docker

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 config/setupmymac | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)


[whimsy] 01/02: Make applications restart on change

Posted by ru...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit e7392e8bcb37ce6ed74a0f4a554ee7c9149261a0
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Wed Nov 27 09:01:47 2019 -0500

    Make applications restart on change
---
 config/setupmymac | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/config/setupmymac b/config/setupmymac
index 48ae8a1..d2370ed 100755
--- a/config/setupmymac
+++ b/config/setupmymac
@@ -366,7 +366,27 @@ then
   restart_apache = true
 end
 
-# Start Apache httpd
+### Make applications restart on change
+
+if Process.uid != 0
+  plist = "#{Dir.home}/Library/LaunchAgents/toucher.plist"
+  contents = File.read("#{__dir__}/toucher.plist")
+  contents[/>(.*ruby.*)</, 1] = RbConfig.ruby
+  if not File.exist?(plist) or File.read(plist) != contents
+    color "$ edit #{plist}"
+    File.write plist, contents
+
+    if `launchctl list`.include? 'org.apache.whimsy/toucher'
+      run "launchctl unload #{plist}"
+    end
+  end
+
+  if not `launchctl list`.include? 'org.apache.whimsy/toucher'
+    run "launchctl load #{plist}"
+  end
+end
+
+### Start Apache httpd
 
 if Process.uid == 0
   if not `launchctl list`.include? 'org.apache.httpd'


[whimsy] 02/02: disable toucher for docker, depends on listen and hasn't been tested with docker

Posted by ru...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit fa6141339f0dfa41de744b5d6c93d2d7738bf6ec
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Wed Nov 27 09:03:53 2019 -0500

    disable toucher for docker, depends on listen and hasn't been tested with docker
---
 config/setupmymac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/setupmymac b/config/setupmymac
index d2370ed..bb505c0 100755
--- a/config/setupmymac
+++ b/config/setupmymac
@@ -368,7 +368,7 @@ end
 
 ### Make applications restart on change
 
-if Process.uid != 0
+if Process.uid != 0 and option != :docker
   plist = "#{Dir.home}/Library/LaunchAgents/toucher.plist"
   contents = File.read("#{__dir__}/toucher.plist")
   contents[/>(.*ruby.*)</, 1] = RbConfig.ruby