josch/multistrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

whitespace tweak

Browse source 
git-svn-id: http://emdebian.org/svn/current@7707 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
codehelp 2010-12-25 18:26:20 +00:00
parent c4da0f4e9a
commit 999a6f5f3b
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
multistrap
View file

@ -183,8 +183,7 @@ if (not -d "${dir}dev") {
# writes outside the multistrap root dir. See: #553599 # writes outside the multistrap root dir. See: #553599
if (-l "${dir}lib64" ) { if (-l "${dir}lib64" ) {
my $r = readlink "${dir}lib64"; my $r = readlink "${dir}lib64";
if ($r =~ m:^/:) if ($r =~ m:^/:) {
{
my $old = `pwd`; my $old = `pwd`;
chomp ($old); chomp ($old);
unlink "${dir}lib64"; unlink "${dir}lib64";
@ -194,12 +193,12 @@ if (-l "${dir}lib64" ) {
chdir ("${old}"); chdir ("${old}");
} }
} else { } else {
my $old = `pwd`; my $old = `pwd`;
chomp ($old); chomp ($old);
chdir ("$dir"); chdir ("$dir");
print _g("INF: Setting ./lib64 -> ./lib symbolic link.\n"); print _g("INF: Setting ./lib64 -> ./lib symbolic link.\n");
symlink "./lib", "lib64"; symlink "./lib", "lib64";
chdir ("${old}"); chdir ("${old}");
} }
system ("rm -rf ${dir}etc/apt/sources.list.d/*"); system ("rm -rf ${dir}etc/apt/sources.list.d/*");
@ -362,8 +361,7 @@ system ("cp $configsh $dir/") if ((defined $configsh) and (-f $configsh));
(not defined $tidy) ? system ("apt-get $config_str update") : &tidy_apt; (not defined $tidy) ? system ("apt-get $config_str update") : &tidy_apt;
if (-l "${dir}lib64" ) { if (-l "${dir}lib64" ) {
my $r = readlink "${dir}lib64"; my $r = readlink "${dir}lib64";
if ($r =~ m:^/:) if ($r =~ m:^/:) {
{
print _g("ERR: ./lib64 -> /lib symbolic link reset to ./lib after unpacking.\n"); print _g("ERR: ./lib64 -> /lib symbolic link reset to ./lib after unpacking.\n");
printf (_g("ERR: Some files may have been unpacked outside %s!\n"), $dir); printf (_g("ERR: Some files may have been unpacked outside %s!\n"), $dir);
} }