parameter.pm (f6ef1f1e) parameter.pm (5b11f0d3)
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 232 unchanged lines hidden (view full) ---

241 # Use windows paths, but with '/'s.
242 $$pathref =~ s/\\/\//g;
243 }
244 else
245 {
246 if (!($$pathref =~ /^\s*\w\:/)) # this is a relative windows path (no dos drive)
247 {
248 $$pathref = cwd() . $installer::globals::separator . $$pathref;
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 232 unchanged lines hidden (view full) ---

241 # Use windows paths, but with '/'s.
242 $$pathref =~ s/\\/\//g;
243 }
244 else
245 {
246 if (!($$pathref =~ /^\s*\w\:/)) # this is a relative windows path (no dos drive)
247 {
248 $$pathref = cwd() . $installer::globals::separator . $$pathref;
249 if ( $installer::globals::isos2 )
250 {
251 $$pathref =~ s/\\/\//g;
252 }
253 else
254 {
255 $$pathref =~ s/\//\\/g;
256 }
249
257
250 $$pathref =~ s/\//\\/g;
251 }
252 }
253 }
254 $$pathref =~ s/[\/\\]\s*$//; # removing ending slashes
255}
256
257##################################################
258# Setting some global parameters

--- 112 unchanged lines hidden (view full) ---

371 if ($installer::globals::languagelist eq "") { $installer::globals::languages_defined_in_productlist = 1; }
372
373 # setting and creating the unpackpath
374
375 if ($installer::globals::unpackpath eq "") # unpackpath not set
376 {
377 $installer::globals::unpackpath = cwd();
378 if ( $installer::globals::iswin ) { $installer::globals::unpackpath =~ s/\//\\/g; }
258 }
259 }
260 }
261 $$pathref =~ s/[\/\\]\s*$//; # removing ending slashes
262}
263
264##################################################
265# Setting some global parameters

--- 112 unchanged lines hidden (view full) ---

378 if ($installer::globals::languagelist eq "") { $installer::globals::languages_defined_in_productlist = 1; }
379
380 # setting and creating the unpackpath
381
382 if ($installer::globals::unpackpath eq "") # unpackpath not set
383 {
384 $installer::globals::unpackpath = cwd();
385 if ( $installer::globals::iswin ) { $installer::globals::unpackpath =~ s/\//\\/g; }
386 if ( $installer::globals::isos2 ) { $installer::globals::unpackpath =~ s/\\/\//g; }
379 }
380
381 if ( $installer::globals::localunpackdir ne "" ) { $installer::globals::unpackpath = $installer::globals::localunpackdir; }
382
383 if (!($installer::globals::unpackpath eq ""))
384 {
385 make_path_absolute(\$installer::globals::unpackpath);
386 }

--- 258 unchanged lines hidden --- 		387 }
388
389 if ( $installer::globals::localunpackdir ne "" ) { $installer::globals::unpackpath = $installer::globals::localunpackdir; }
390
391 if (!($installer::globals::unpackpath eq ""))
392 {
393 make_path_absolute(\$installer::globals::unpackpath);
394 }

--- 258 unchanged lines hidden ---