[Unattended-CVS] unattended/install/dosbin install.pl,1.92,1.93

[<pa...@us...>]

Update of /cvsroot/unattended/unattended/install/dosbin
In directory sc8-pr-cvs1:/tmp/cvs-serv16419

Modified Files:
	install.pl 
Log Message:
Fix bugs in using different drive letter for z:


Index: install.pl
===================================================================
RCS file: /cvsroot/unattended/unattended/install/dosbin/install.pl,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- install.pl	21 Sep 2003 17:51:29 -0000	1.92
+++ install.pl	21 Sep 2003 18:19:40 -0000	1.93
@@ -469,8 +469,7 @@
 sub batfile_first_lines () {
     if (!defined $_batfile_first_lines) {
         $_batfile_first_lines = { };
-        my $z = $u->{'_meta'}->{'z_drive'};
-        my $script_dir = "$z\\scripts";
+        my $script_dir = 'z:\\scripts'
         opendir SCRIPTS, $script_dir
             or die "Unable to opendir $script_dir: $^E";
         while (my $ent = readdir SCRIPTS) {
@@ -550,7 +549,7 @@
 
 $u->comments ('_meta', 'OS_dir') = ['Directory holding OS media directories'];
 $u->{'_meta'}->{'OS_dir'} =
-    sub { return $file_spec->catdir ($u->{'_meta'}->{'z_drive'}, 'os'); };
+    sub { return $file_spec->catdir ('z:', 'os'); };
 
 $u->{'_meta'}->{'OS_media'} = \&ask_os;
 
@@ -641,8 +640,7 @@
         $src_tree =~ /\\$/
             or $src_tree .= '\\';
         $src_tree .= 'i386';
-        my $z = $u->{'_meta'}->{'z_drive'};
-        return "$z;cd $src_tree;winnt $lang_opts /s:$src_tree /u:$unattend_txt";
+        return "z:;cd $src_tree;winnt $lang_opts /s:$src_tree /u:$unattend_txt";
     };
 
 $u->{'_meta'}->{'edit_files'} = '1';
@@ -710,14 +708,14 @@
         else {
             my $netinst = $u->{'_meta'}->{'netinst'};
             # Basic framework for mapping Z: drive
-            my $z = $u->{'_meta'}->{'z_drive'};
             my $mapznrun = $file_spec->catfile ($netinst, 'mapznrun.bat');
             print "Copying $mapznrun...";
-            copy ("$z\\bin\\mapznrun.bat", $mapznrun)
-                or die "Unable to copy $z\\bin\\mapznrun.bat to $mapznrun";
+            copy ("z:\\bin\\mapznrun.bat", $mapznrun)
+                or die "Unable to copy z:\\bin\\mapznrun.bat to $mapznrun";
             print "done.\n";
 
             # "Permanent" credentials (drive letter, UNC path)
+            my $z = $u->{'_meta'}->{'z_drive'};
             my $z_path = $u->{'_meta'}->{'z_path'};
             my $permcred = $file_spec->catfile ($netinst, 'permcred.bat');
             print "Creating $permcred...";