Merge branch 'master' of git+ssh://github.com/adefaria/clearscm

diff --git a/.gitignore b/.gitignore
index 6ac1ff5..bd1b2a5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ docker
 web/Resumes/Andrew/.resume.hist
 web/Resumes/Andrew/.resumehits
 /cadence/
+bin/test.pl

diff --git a/bin/announceEmail.pl b/bin/announceEmail.pl
index 3b9d52a..a864634 100755 (executable)
--- a/bin/announceEmail.pl
+++ b/bin/announceEmail.pl
@@ -252,9 +252,7 @@ sub MonitorMail() {
 
     my $greeting = $greetings[int rand $#greetings];
     my $msg      = "$greeting from $from... $subject";
-       $msg      =~ s/\"/\\"/g;
-
-    my $hour = (localtime)[2];
+    my $hour     = (localtime)[2];
 
     # Only announce if after 6 Am. Note this will announce up until
     # midnight but that's ok. I want midnight to 6 Am as silent time.

diff --git a/bin/gp b/bin/gp
index 38e940e..4f6dce9 100755 (executable)
--- a/bin/gp
+++ b/bin/gp
@@ -1,4 +1,8 @@
 #!/bin/bash
 #
 # Simple script to restart gnome-panel since it keeps dying on me.
-gnome-panel --replace > /dev/null 2>&1 &
+logfile=/var/local/log/gnome-panel.log
+while true; do
+  gnome-panel --replace >> $logfile 2>&1 
+  echo "$(date) Restarting gnome-panel" >> $logfile
+done

diff --git a/maps/bin/maps b/maps/bin/maps
index c5d3a8c..fc0a65f 100755 (executable)
--- a/maps/bin/maps
+++ b/maps/bin/maps
@@ -125,7 +125,7 @@ sub ValidDomainUser($) {
 sub formatRule($) {
   my ($rec) = @_;
 
-  return "$rec->{pattern}\@$rec->{domain}:$rec->{sequence}/$rec->{hit_count}";
+  return "$rec->{pattern}\@$rec->{domain}:$rec->{sequence}/$rec->{hit_count} $rec->{comment}";
 } # formatRule
 
 sub ProcessMsgs ($$$) {

diff --git a/maps/rebuildDB.sql b/maps/rebuildDB.sql
new file mode 100644 (file)
index 0000000..b456fea
--- /dev/null
+++ b/maps/rebuildDB.sql
@@ -0,0 +1,5 @@
+drop database MAPS;
+
+source /opt/clearscm/maps/bin/MAPSDB.sql;
+
+source /tmp/MAPS.db;

diff --git a/rc/bash_login b/rc/bash_login
index c59c2b7..b587baf 100644 (file)
--- a/rc/bash_login
+++ b/rc/bash_login
@@ -324,8 +324,13 @@ done
 set_prompt
 
 # Set display to local
-
 export DISPLAY=${DISPLAY:-:0}
+
+# New tmp location
+if [ -d /System/tmp ]; then
+  export TMP=/System/tmp
+fi
+
 # Reset home in case it changed
 HOME=$saved_home
 

diff --git a/rc/client_scripts/cPanel b/rc/client_scripts/cPanel
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/rc/sshconfig b/rc/sshconfig
index 4d986a5..fd83394 100644 (file)
--- a/rc/sshconfig
+++ b/rc/sshconfig
@@ -1,7 +1,11 @@
 StrictHostKeyChecking no
 LogLevel ERROR
 
-Host jupiter cpanel github.com sandbox sandboxal
+Host mars earth home defaria.com
+  ForwardX11 yes
+  ForwardX11Trusted yes
+  
+Host jupiter cpanel github.com sandbox sandboxal sandboxu
   ForwardX11 no
   ForwardX11Trusted no
 
@@ -16,9 +20,6 @@ Host home
   User andrew
   IdentityFile         ~/.ssh/id_ecdsa
 
-Host nightly
-  Hostname 10.2.96.137
-
 Host sandbox
   Hostname 10.2.99.60
   IdentityFile         ~/.ssh/cpanelkey