aboutsummaryrefslogtreecommitdiffstats
path: root/vms/remove_old_gawk.com
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2016-01-11 05:49:48 +0200
committerArnold D. Robbins <arnold@skeeve.com>2016-01-11 05:49:48 +0200
commit373d2691a1b80839613a3d069292c2a7a73ff10e (patch)
treec516c1d5b22081eb79ecd7f8d1c0b02d60634216 /vms/remove_old_gawk.com
parent844a64ad302bfd4475024826ef57651079a02f98 (diff)
parent2fe3818b9574f685eaeefc9e7d61cf7ba00ec87e (diff)
downloadegawk-373d2691a1b80839613a3d069292c2a7a73ff10e.tar.gz
egawk-373d2691a1b80839613a3d069292c2a7a73ff10e.tar.bz2
egawk-373d2691a1b80839613a3d069292c2a7a73ff10e.zip
Merge branch 'gawk-4.1-stable'
Diffstat (limited to 'vms/remove_old_gawk.com')
-rw-r--r--vms/remove_old_gawk.com9
1 files changed, 6 insertions, 3 deletions
diff --git a/vms/remove_old_gawk.com b/vms/remove_old_gawk.com
index ed68fc45..ef7bce46 100644
--- a/vms/remove_old_gawk.com
+++ b/vms/remove_old_gawk.com
@@ -24,6 +24,7 @@ $ file = f$element(i, ",", old_cutils)
$ if file .eqs. "" then goto cutils_loop_end
$ if file .eqs. "," then goto cutils_loop_end
$ call update_old_image 'file'
+$ call update_old_image 'file' '[usr.bin]'
$ i = i + 1
$ goto cutils_loop
$cutils_loop_end:
@@ -53,9 +54,11 @@ $!-------------------------------------------
$update_old_image: subroutine
$!
$ file = p1
+$ fdir = p2
+$ if fdir .eqs. "" then fdir = "[bin]"
$! First get the FID of the new gawk image.
$! Don't remove anything that matches it.
-$ new_gawk = f$search("GNV$GNU:[BIN]GNV$''file'.EXE")
+$ new_gawk = f$search("GNV$GNU:[user.bin]GNV$''file'.EXE")
$!
$ new_gawk_fid = "No_new_gawk_fid"
$ if new_gawk .nes. ""
@@ -71,9 +74,9 @@ $! Ok to delete and replace.
$!
$!
$ old_gawk_fid = "No_old_gawk_fid"
-$ old_gawk = f$search("gnv$gnu:[bin]''file'.")
+$ old_gawk = f$search("gnv$gnu:''fdir'''file'.")
$ old_gawk_exe_fid = "No_old_gawk_fid"
-$ old_gawk_exe = f$search("gnv$gnu:[bin]''file'.exe")
+$ old_gawk_exe = f$search("gnv$gnu:''fdir'''file'.exe")
$ if old_gawk_exe .nes. ""
$ then
$ old_gawk_exe_fid = f$file_attributes(old_gawk_exe, "FID")