GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Unverified Commit 9b3531c0 authored by boklm's avatar boklm
Browse files

Fix extraction of Windows bundle with some versions of 7z

With some versions of 7z, the bundle is not extracted in an "$_OUTDIR"
directory.
parent 6ff52990
......@@ -531,7 +531,11 @@ sub extract_tbb {
copy($tbbfile, "$tmpdir/$f");
system('7z', 'x', $f);
$tbbinfos->{tbbdir} = "$tmpdir/torbrowser/Browser";
move("$tmpdir/\$_OUTDIR", "$tmpdir/torbrowser");
move("$tmpdir/\$_OUTDIR", "$tmpdir/torbrowser") if -d "$tmpdir/\$_OUTDIR";
if (-d "$tmpdir/Browser") {
mkdir "$tmpdir/torbrowser";
move("$tmpdir/Browser", "$tmpdir/torbrowser/Browser");
}
move ("$tmpdir/Start Tor Browser.exe", "$tmpdir/torbrowser/");
} elsif ($tbbinfos->{os} eq 'MacOSX') {
my $mountpoint = File::Temp::newdir('XXXXXX', DIR => $options->{tmpdir});
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment