osgeo4w: fix creatensis.pl

Author: jef-n

ms-windows/osgeo4w/creatensis.pl

@@ -122,6 +122,10 @@ sub getDeps {
 my @desc;
 foreach my $p ( keys %pkgs ) {
 	my @f;
+	unless( exists $file{$p} ) {
+		print "No file for package $p found found.\n" if $verbose;
+		next;
+	}
 	push @f, "$root/$file{$p}";
 
 	if( exists $lic{$p} ) {
@@ -174,9 +178,19 @@ sub getDeps {
 	print O "INSTALLED.DB 2\n";
 
 	foreach my $pn ( keys %pkgs ) {
-		$p = $file{$pn};
+		my $p = $file{$pn};
+		unless( defined $p ) {
+			print "No package found for $pn\n" if $verbose;
+			next;
+		}
+
 		$p =~ s#^.*/#$packages/#;
 
+		unless( -r $p ) {
+			print "Package $p not found.\n" if $verbose;
+			next;
+		}
+
 		print O "$pn $p 0\n";
 
 		print "Unpacking $p...\n" if $verbose;
@@ -288,8 +302,8 @@ sub getDeps {
 $version = "$major.$minor.$patch" unless defined $version;
 
 unless( defined $binary ) {
-	if( -f "binary-$archpostfix$version" ) {
-		open P, "binary-$archpostfix$version";
+	if( -f "binary$archpostfix-$version" ) {
+		open P, "binary$archpostfix-$version";
 		$binary = <P>;
 		close P;
 		$binary++;
@@ -386,7 +400,7 @@ sub getDeps {
 system $cmd;
 die "running nsis failed" if $?;
 
-open P, ">osgeo4w/binary-$archpostfix$version";
+open P, ">osgeo4w/binary$archpostfix-$version";
 print P $binary;
 close P;