From 05da1a4a31a82e325f7f8dc70e26059bbd9dfa77 Mon Sep 17 00:00:00 2001 From: freesource Date: Sun, 4 Nov 2001 08:54:53 +0000 Subject: [PATCH] Changes to make $> > 0 happy. --- BootRoot/YardBox.pm | 2 +- gbootroot | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/BootRoot/YardBox.pm b/BootRoot/YardBox.pm index c98e98c..8fd25db 100644 --- a/BootRoot/YardBox.pm +++ b/BootRoot/YardBox.pm @@ -579,7 +579,7 @@ sub continue { sub check { - $error = read_contents_file("$template_dir$template"); + $error = read_contents_file("$template_dir$template", $tmp); return if $error && $error eq "ERROR"; } diff --git a/gbootroot b/gbootroot index cf9361e..f3170af 100755 --- a/gbootroot +++ b/gbootroot @@ -589,16 +589,16 @@ else { my $user = $>; - if (!-d "$tmp1/gboot_non_root_" . $user) { - $tmp = "$tmp1/gboot_non_root" . $user if err_custom_perl( - "mkdir $tmp1/gboot_non_root_" . $user, + if (!-d "$tmp1/gboot_non_root_$user") { + $tmp = "$tmp1/gboot_non_root_$user" if err_custom_perl( + "mkdir $tmp1/gboot_non_root_$user", "gBootRoot: ERROR: Could not make temporary directory") != 2; } $tmp = "$tmp1/gboot_non_root_" . $user; - if (!-d "$tmp1/gboot_non_root_mnt_" . $user) { - $mnt = "$tmp1/gboot_non_root_mnt_" . $user if err_custom_perl( - "mkdir $tmp1/gboot_non_root_mnt_" . $user, + if (!-d "$tmp1/gboot_non_root_mnt_$user") { + $mnt = "$tmp1/gboot_non_root_mnt_$user" if err_custom_perl( + "mkdir $tmp1/gboot_non_root_mnt_$user", "gBootRoot: ERROR: Could not make mount directory") != 2; } $mnt = "$tmp1/gboot_non_root_mnt" . $user;