Merge branch 'master' of /opt/git/clearscm

diff --git a/bin/setbg b/bin/setbg
index e3f5a46..39ce45b 100755 (executable)
--- a/bin/setbg
+++ b/bin/setbg
@@ -98,7 +98,7 @@ foreach (@imgDir) {
 } # foreach
 
 # Using gsettings
-my $setbg      = "gsettings";
+my $setbg          = "gsettings";
 my $setbgOpts  = "set org.gnome.desktop.background picture-uri \"file://";
 
 my @images;
@@ -133,8 +133,14 @@ while () {
 
   my $cmd = "$setbg $setbgOpts$image\" 2> /dev/null";
 
-  `$cmd`;
+  my @output = `$cmd`;
 
+  if ($? != 0) {
+    display "ERROR Trying to set background - command used \"$cmd\"", $log;
+    display "Output:";
+    display join "\n", @output, $log;
+  } # if
+  
   close $log;
   
   sleep $sleep;

diff --git a/rc/bash_login b/rc/bash_login
index 0008953..ff64550 100644 (file)
--- a/rc/bash_login
+++ b/rc/bash_login
@@ -100,8 +100,6 @@ if [ -r /etc/bash_completion -a $ARCHITECTURE != "cygwin" ]; then
   source /etc/bash_completion
 fi
 
-export CVSROOT=:ext:andrew@clearscm.com:/var/cvs/cvsroot
-
 if [ -x ~/.rc/logout ]; then
   trap "~/.rc/logout" 0
 fi

diff --git a/rc/client_scripts/Axcient b/rc/client_scripts/Axcient
index a450ee8..918ed38 100755 (executable)
--- a/rc/client_scripts/Axcient
+++ b/rc/client_scripts/Axcient
@@ -15,4 +15,4 @@
 export SMTPHOST=tesla3.axcient.inc
 export SMTPFROM=buildandrelease@axcient.com
 
-append_to_path /opt/axscripts/bin
+append_to_path /opt/brscripts/bin