[imagebuilder] fix initscripts activation (closes: #4037, #4745)

[openwrt.git] / scripts / timestamp.pl

diff --git a/scripts/timestamp.pl b/scripts/timestamp.pl
index 89ec4e7..3bf0571 100755 (executable)
--- a/scripts/timestamp.pl
+++ b/scripts/timestamp.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # 
 # Copyright (C) 2006 OpenWrt.org
 #
@@ -13,14 +13,15 @@ sub get_ts($$) {
        my $options = shift;
        my $ts = 0;
        my $fn = "";
-       open FIND, "find $path -not -path \\*.svn\\* -and -not -path \\*CVS\\* $options 2>/dev/null |";
+       $path .= "/" if( -d $path);
+       open FIND, "find $path -type f -and -not -path \\*.svn\\* -and -not -path \\*CVS\\* $options 2>/dev/null |";
        while (<FIND>) {
                chomp;
                my $file = $_;
                next if -l $file;
-               my @stat = stat $file;
-               if ($stat[9] > $ts) {
-                       $ts = $stat[9];
+               my $mt = (stat $file)[9];
+               if ($mt > $ts) {
+                       $ts = $mt;
                        $fn = $file;
                }
        }
@@ -36,7 +37,7 @@ while (@ARGV > 0) {
        my $path = shift @ARGV;
        if ($path =~ /^-x/) {
                my $str = shift @ARGV;
-               $options{"findopts"} .= " -and -not -path \\*".$str."\\*"
+               $options{"findopts"} .= " -and -not -path '".$str."'"
        } elsif ($path =~ /^-f/) {
                $options{"findopts"} .= " -follow";
        } elsif ($path =~ /^-n/) {
@@ -47,7 +48,7 @@ while (@ARGV > 0) {
        } else {
                my ($tmp, $fname) = get_ts($path, $options{"findopts"});
                if ($tmp > $ts) {
-                       if ($options{'-f'}) {
+                       if ($options{'-F'}) {
                                $n = $fname;
                        } else {
                                $n = $path;