aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dists/amiga/Ext_Inst_so.rexx19
-rw-r--r--dists/amiga/RM2AG.rexx24
2 files changed, 22 insertions, 21 deletions
diff --git a/dists/amiga/Ext_Inst_so.rexx b/dists/amiga/Ext_Inst_so.rexx
index 845acc687b..2636aae0b2 100644
--- a/dists/amiga/Ext_Inst_so.rexx
+++ b/dists/amiga/Ext_Inst_so.rexx
@@ -1,5 +1,5 @@
/*
-$VER: Ext_Inst_so.rexx 0.3 (21.10.2019) Extract and install compiled-in shared libraries from a given ELF binary.
+$VER: Ext_Inst_so.rexx 0.4 (23.10.2019) Extract and install compiled-in shared libraries from a given ELF binary.
*/
PARSE ARG executable install_path
@@ -10,7 +10,7 @@ Check if arguments are available, otherwise quit.
IF ~ARG() THEN DO
SAY 'No Arguments given!'
SAY 'Usage: Ext_Inst_so.rexx EXECUTABLE INSTALL_PATH'
- EXIT No Arguments given!
+ EXIT
END
/*
@@ -21,7 +21,7 @@ and trailing spaces.
*/
IF ~EXISTS(executable) THEN DO
SAY executable' not available!'
- EXIT EXECUTABLE not available!
+ EXIT
END
ELSE DO
executable=STRIP(executable)
@@ -29,10 +29,11 @@ ELSE DO
END
IF installpath='' THEN DO
SAY 'No installation destination given!'
- EXIT No installation destination given!
+ EXIT
END
ELSE DO
install_path=STRIP(install_path)
+ install_path=STRIP(install_path,'T','/')
install_path=COMPRESS(install_path,'"')
/*
Check for destination path and create it, if needed.
@@ -51,7 +52,7 @@ Error check, if I/O went wrong.
*/
IF ~OPEN(SO_read,'so_dump','R') THEN DO
SAY 'File so_dump opening failed!'
- EXIT File so_dump opening failed!
+ EXIT
END
/*
@@ -79,14 +80,14 @@ DO WHILE i>0
IF EXISTS('SDK:local/newlib/lib/'lib.so) THEN
ADDRESS COMMAND 'copy clone SDK:local/newlib/lib/'lib.so install_path'/sobjs/'
ELSE
- IF EXISTS('SYS:SOBJS/'lib.so) THEN
+ IF EXISTS('SDK:gcc/lib/'lib.so) THEN
ADDRESS COMMAND 'copy clone SYS:SOBJS/'lib.so install_path'/sobjs/'
ELSE DO
/*
If a shared library is not found, abort.
*/
SAY lib.so' not found! Aborting!'
- EXIT Shared Library not found! Aborting!
+ EXIT
END
END
ELSE
@@ -99,9 +100,9 @@ Close the file manually anyway.
*/
IF ~CLOSE(SO_Read) THEN DO
SAY 'File so_dump closing failed!'
- EXIT File so_dump opening failed!
+ EXIT
END
ADDRESS COMMAND 'delete so_dump'
-EXIT 0
+EXIT
diff --git a/dists/amiga/RM2AG.rexx b/dists/amiga/RM2AG.rexx
index f496605ffd..2dac084e0d 100644
--- a/dists/amiga/RM2AG.rexx
+++ b/dists/amiga/RM2AG.rexx
@@ -13,7 +13,7 @@ Check if arguments are available, otherwise quit.
IF ~ARG() THEN DO
SAY 'No Arguments given!'
SAY 'Usage: RM2AG.rexx README_MD INSTALL_PATH'
- EXIT No Arguments given!
+ EXIT
END
/*
@@ -24,7 +24,7 @@ and trailing spaces.
*/
IF ~EXISTS(readme_md) THEN DO
SAY readme_md' not available!'
- EXIT README.md not available!
+ EXIT
END
ELSE DO
readme_md=STRIP(readme_md)
@@ -32,7 +32,7 @@ ELSE DO
END
IF installpath='' THEN DO
SAY 'No installation destination given!'
- EXIT No installation destination given!
+ EXIT
END
ELSE DO
install_path=STRIP(install_path)
@@ -46,31 +46,31 @@ END
IF ~OPEN(check_readme,readme_md,'R') THEN DO
SAY readme_md' opening failed!'
- EXIT README.md opening failed!
+ EXIT
END
IF READCH(check_readme,18) = '# [ScummVM README]' THEN DO
IF ~CLOSE(check_readme) THEN DO
SAY readme_md' closing failed!'
- EXIT README.md closing failed!
+ EXIT
END
END
ELSE DO
IF ~CLOSE(check_readme) THEN DO
SAY readme_md' closing failed!'
- EXIT File README.md closing failed!
+ EXIT
END
SAY "Not the ScummVM README.md file. Aborting!"
- EXIT Not the ScummVM README.md file.
+ EXIT
END
IF ~OPEN(readme_read,readme_md,'R') THEN DO
SAY 'File 'readme_md' opening failed!'
- EXIT File README.md opening failed!
+ EXIT
END
IF ~OPEN(guide_write,'README.guide','W') THEN DO
SAY README.guide' opening failed!'
- EXIT README.md opening failed!
+ EXIT
END
/*
@@ -298,11 +298,11 @@ WRITELN(guide_write,'@ENDNODE')
IF ~CLOSE(readme_read) THEN DO
SAY readme_md' closing failed!'
- EXIT README.md closing failed!
+ EXIT
END
IF ~CLOSE(guide_write) THEN DO
SAY 'README.guide closing failed!'
- EXIT README.guide closing failed!
+ EXIT
END
/*
@@ -312,4 +312,4 @@ and delete README.guide.
ADDRESS COMMAND 'copy README.guide 'install_path
ADDRESS COMMAND 'delete README.guide'
-EXIT 0
+EXIT