luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed "realpath" in the scripts (added from a pull request merge 

earlier today) to "readlink -f", because "realpath" does not exist
on some systems (e.g., CentOS).  "readlink" seems to be more
universally available.  Noticed that the ext2spice and ext2sim
scripts use /bin/sh instead of /bin/bash, which would cause problems
with some systems where sh != bash.
This commit is contained in:
Tim Edwards 2021-01-04 14:53:21 -05:00
parent 5005f77d3f
commit 22c6eb0f2c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tcltk/ext2sim.sh.in
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# #
# Standalone script for ext2sim, for Tcl-based magic 8.0 # Standalone script for ext2sim, for Tcl-based magic 8.0
# #
@ -18,7 +18,7 @@ TCL_REL_OR_ABS=TCL_DIR_REL_OR_ABS
if [ "${TCL_REL_OR_ABS:0:1}" = "/" ]; then if [ "${TCL_REL_OR_ABS:0:1}" = "/" ]; then
TCL_DIR=$TCL_REL_OR_ABS TCL_DIR=$TCL_REL_OR_ABS
else else
TCL_DIR=$(dirname $(realpath ${BASH_SOURCE[0]}))/$TCL_REL_OR_ABS TCL_DIR=$(dirname $(readlink -f ${BASH_SOURCE[0]}))/$TCL_REL_OR_ABS
fi fi
# #
eval ${TCL_DIR}/magicdnull -dnull -noconsole -nowrapper $mgargs <<EOF eval ${TCL_DIR}/magicdnull -dnull -noconsole -nowrapper $mgargs <<EOF

4
tcltk/ext2spice.sh.in
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# #
# Standalone script for ext2spice, for Tcl-based magic 8.0 # Standalone script for ext2spice, for Tcl-based magic 8.0
# #
@ -18,7 +18,7 @@ TCL_REL_OR_ABS=TCL_DIR_REL_OR_ABS
if [ "${TCL_REL_OR_ABS:0:1}" = "/" ]; then if [ "${TCL_REL_OR_ABS:0:1}" = "/" ]; then
TCL_DIR=$TCL_REL_OR_ABS TCL_DIR=$TCL_REL_OR_ABS
else else
TCL_DIR=$(dirname $(realpath ${BASH_SOURCE[0]}))/$TCL_REL_OR_ABS TCL_DIR=$(dirname $(readlink -f ${BASH_SOURCE[0]}))/$TCL_REL_OR_ABS
fi fi
# #
eval ${TCL_DIR}/magicdnull -dnull -noconsole -nowrapper $mgargs <<EOF eval ${TCL_DIR}/magicdnull -dnull -noconsole -nowrapper $mgargs <<EOF

2
tcltk/magic.sh.in
View File

@ -15,7 +15,7 @@ TCL_REL_OR_ABS=TCL_DIR_REL_OR_ABS
if [ "${TCL_REL_OR_ABS:0:1}" = "/" ]; then if [ "${TCL_REL_OR_ABS:0:1}" = "/" ]; then
TCL_DIR=$TCL_REL_OR_ABS TCL_DIR=$TCL_REL_OR_ABS
else else
TCL_DIR=$(dirname $(realpath ${BASH_SOURCE[0]}))/$TCL_REL_OR_ABS TCL_DIR=$(dirname $(readlink -f ${BASH_SOURCE[0]}))/$TCL_REL_OR_ABS
fi fi
TKCON=true TKCON=true
DNULL= DNULL=