Attachment #50839 for issue #85208

View | Details | Raw Unified | Return to issue 85208
Collapse All | Expand All




    }    
}

$sourcefile = $ARGV[0];

if( $^O =~ /cygwin/i ) {
    # We might get paths with backslashes, fix that.
    $lstfile =~ s/\\/\//g;
    $sourcefile =~ s/\\/\//g;
}

# read openoffice.lst
unless(open(LSTFILE, "sed -n \"/^$product\$/,/^}\$/ p\" $lstfile |")) {
    print STDERR "Can't open $lstfile file: $!\n";

$id = $productname . "_" . $id . "_" . $languages;

# open input file
unless (open(SOURCE, $sourcefile)) {
    print STDERR "Can't open $sourcefile file: $!\n";
    return;
}


Lines 63-69 Link Here

(-)solenv/bin/modules/installer/control.pm (-1 / +1 lines)
63		63
64	if( $^O =~ /cygwin/i )	64	if( $^O =~ /cygwin/i )
65	{ # When using cygwin's perl the PATH variable is POSIX style and ...	65	{ # When using cygwin's perl the PATH variable is POSIX style and ...
66	$pathvariable = qx{guw.exe echo "$pathvariable"} ;	66	$pathvariable = qx{cygpath -dp "$pathvariable"} ;
67	# has to be converted to DOS style for further use.	67	# has to be converted to DOS style for further use.
68	$local_pathseparator = ';';	68	$local_pathseparator = ';';
69	}	69	}

Lines 899-905 Link Here

(-)solenv/bin/modules/installer/servicesfile.pm (-1 / +1 lines)
899		899
900	if ( $^O =~ /cygwin/i && $ENV{'USE_SHELL'} eq "4nt" )	900	if ( $^O =~ /cygwin/i && $ENV{'USE_SHELL'} eq "4nt" )
901	{ # $servicesdir is used as a parameter for regcomp and has to be DOS style	901	{ # $servicesdir is used as a parameter for regcomp and has to be DOS style
902	$servicesdir = qx{guw.exe echo "$servicesdir"};	902	$servicesdir = qx{cygpath -d "$servicesdir"};
903	chomp($servicesdir);	903	chomp($servicesdir);
904	$servicesdir =~ s/\\/\//g;	904	$servicesdir =~ s/\\/\//g;
905	}	905	}

Return to issue 85208

Lines 74-79 Link Here

(-)solenv/bin/gen_update_info.pl (-2 / +10 lines)
74	}	74	}
75	}	75	}
76		76
		77	$sourcefile = $ARGV[0];
		78
		79	if( $^O =~ /cygwin/i ) {
		80	# We might get paths with backslashes, fix that.
		81	$lstfile =~ s/\\/\//g;
		82	$sourcefile =~ s/\\/\//g;
		83	}
		84
77	# read openoffice.lst	85	# read openoffice.lst
78	unless(open(LSTFILE, "sed -n \"/^$product\$/,/^}\$/ p\" $lstfile \|")) {	86	unless(open(LSTFILE, "sed -n \"/^$product\$/,/^}\$/ p\" $lstfile \|")) {
79	print STDERR "Can't open $lstfile file: $!\n";	87	print STDERR "Can't open $lstfile file: $!\n";
Lines 105-112 Link Here
105	$id = $productname . "_" . $id . "_" . $languages;	113	$id = $productname . "_" . $id . "_" . $languages;
106		114
107	# open input file	115	# open input file
108	unless (open(SOURCE, $ARGV[0])) {	116	unless (open(SOURCE, $sourcefile)) {
109	print STDERR "Can't open $ARGV[0] file: $!\n";	117	print STDERR "Can't open $sourcefile file: $!\n";
110	return;	118	return;
111	}	119	}
112		120