SVN: vfmg/trunk/vfmg

sparky sparky at pld-linux.org
Fri Jan 19 21:38:31 CET 2007


Author: sparky
Date: Fri Jan 19 21:38:30 2007
New Revision: 8181

Modified:
   vfmg/trunk/vfmg
Log:
- fix exec checking


Modified: vfmg/trunk/vfmg
==============================================================================
--- vfmg/trunk/vfmg	(original)
+++ vfmg/trunk/vfmg	Fri Jan 19 21:38:30 2007
@@ -187,26 +187,6 @@
   );
 
 my @path;
-if ( $opt{exec} ) {
-	@path = (grep (-d, split(/:+/,$ENV{'PATH'})), "");
-	if( length $opt{xterm} ) {
-		my $exists = 0;
-		my $bin = $opt{xterm};
-		$bin =~ s/(\S+).*/$1/;
-		foreach my $dir (@path) {
-			if (-x "$dir/$bin") {
-				$exists = 1;
-				$opt{xterm} = "$dir/$opt{xterm}" if $opt{exec_full};
-				last;
-			}
-		}
-		unless ($exists) {
-			$opt{xterm} = "";
-			warn "Can't find $bin.",
-				" Terminal applications will not be included.\n";
-		}
-	}
-}
 # search dirs }}}
 
 $o_output = $ARGV[0];
@@ -259,6 +239,26 @@
 
 # check dependencies
 $opt{exec} = 1 if $opt{exec_full};
+if ( $opt{exec} ) {
+	@path = (grep (-d, split(/:+/,$ENV{'PATH'})), "");
+	if( length $opt{xterm} ) {
+		my $exists = 0;
+		my $bin = $opt{xterm};
+		$bin =~ s/(\S+).*/$1/;
+		foreach my $dir (@path) {
+			if (-x "$dir/$bin") {
+				$exists = 1;
+				$opt{xterm} = "$dir/$opt{xterm}" if $opt{exec_full};
+				last;
+			}
+		}
+		unless ($exists) {
+			$opt{xterm} = "";
+			warn "Can't find $bin.",
+				" Terminal applications will not be included.\n";
+		}
+	}
+}
 eval { VFMG::Icons::preconf() };
 $opt{encoding} = "utf8" if $opt{utf};
 unless (length $opt{destdir}) {


More information about the pld-cvs-commit mailing list