mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-03-04 15:51:37 +00:00
For finding the user profile, try %APPDATA% first, use %USERPROFILE% only as fallback, as that approach also works on localized Windows versions, r=Chase
This commit is contained in:
parent
dccb9e4d1e
commit
23a8e9fded
@ -24,7 +24,7 @@ use Config; # for $Config{sig_name} and $Config{sig_num}
|
||||
use File::Find ();
|
||||
use File::Copy;
|
||||
|
||||
$::UtilsVersion = '$Revision: 1.305 $ ';
|
||||
$::UtilsVersion = '$Revision: 1.306 $ ';
|
||||
|
||||
package TinderUtils;
|
||||
|
||||
@ -1119,12 +1119,16 @@ sub get_profile_dir {
|
||||
if ($Settings::OS =~ /^WIN9/) { # 98 [but what does uname say on Me?]
|
||||
$profile_dir = $ENV{winbootdir} || $ENV{windir} || "C:\\WINDOWS";
|
||||
$profile_dir .= "\\Application Data";
|
||||
} elsif ($Settings::OS =~ /^WINNT/) { # NT 4, 2K, XP(?)
|
||||
# afaict, %USERPROFILE% should always be there, NT 4.0 and up
|
||||
if ($ENV{USERPROFILE}) {
|
||||
} elsif ($Settings::OS =~ /^WINNT/) { # NT 4, 2K, XP
|
||||
# try %APPDATA% first as it works even on localized OS versions
|
||||
if ($ENV{APPDATA}) {
|
||||
$profile_dir = $ENV{APPDATA};
|
||||
}
|
||||
elsif ($ENV{USERPROFILE}) {
|
||||
# afaict, %USERPROFILE% should always be there, NT 4.0 and up
|
||||
$profile_dir = $ENV{USERPROFILE} . "\\Application Data";
|
||||
} else { # use %APPDATA% as a fallback (or prepare to fail)
|
||||
$profile_dir = $ENV{APPDATA} || "C:\\_UNKNOWN_";
|
||||
} else { # prepare to fail
|
||||
$profile_dir = "C:\\_UNKNOWN_";
|
||||
}
|
||||
}
|
||||
if ($Settings::VendorName) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user