X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=bin%2Fsetbg;h=09311f582ebf069f2b65488942a5879abfea4700;hb=7741c29ab943bbd7972f74f17d357bf0cdb19f7b;hp=c7a9b249b73801a3a3653551499ba247579f19d2;hpb=cddcd81ef5480322b83a2cd6d925774697e6539a;p=clearscm.git

diff --git a/bin/setbg b/bin/setbg
index c7a9b24..09311f5 100755
--- a/bin/setbg
+++ b/bin/setbg
@@ -57,6 +57,7 @@ use warnings;
 use FindBin;
 use Getopt::Long;
 use Proc::ProcessTable;
+use File::Spec;
 use CGI qw/:standard/;
 
 use lib "$FindBin::Bin/../lib";
@@ -107,8 +108,10 @@ GetOptions (
   'bgdir=s' => \@imgDirs,
 ) || Usage;
 
-foreach (@imgDirs) {
-  error "$_ is not a directory", 1 unless -d $_;
+for (my $i = 0; $i < scalar @imgDirs; $i++) {
+  error "$imgDirs[$i] is not a directory", 1 unless -d $imgDirs[$i];
+  
+  $imgDirs[$i] = File::Spec->rel2abs ($imgDirs[$i]);
 } # foreach
 
 # Using gsettings
@@ -117,7 +120,7 @@ my $setbgOpts	= "set org.gnome.desktop.background picture-uri \"file://";
 
 my @images = fillPictures;
 
-Usage "No images to display. Must specify -imgDir" unless @images;
+Usage "No images to display. Must specify -bgdir" unless @images;
  
 sub SwitchWallPaper {
   # We don't need to do anything here, just handle the interrupt and
@@ -137,7 +140,7 @@ while () {
   my $image = escapeHTML ($images[int (rand $#images)]);
 
   open my $log, '>', "$ENV{HOME}/.$FindBin::Script"
-    or error "Unable to open $ENV{HOME}/.setbg for writing - $!", 1;
+    or error "Unable to open $ENV{HOME}/.$FindBin::Script for writing - $!", 1;
 
   display $image, $log;