--- a/lib/scripts/run-smlnj Mon Sep 16 11:46:24 2013 +0200
+++ b/lib/scripts/run-smlnj Mon Sep 16 12:37:54 2013 +0200
@@ -47,6 +47,8 @@
check_mlhome_file "$SML"
check_mlhome_file "$ARCH_N_OPSYS"
+eval $("$ARCH_N_OPSYS")
+
## prepare databases
@@ -63,7 +65,11 @@
COMMIT='fun commit () = false;'
MLEXIT=""
else
- COMMIT="fun commit () = not (SMLofNJ.exportML\"$OUTFILE\");"
+ if [ -z "$INFILE" ]; then
+ COMMIT="fun commit () = if SMLofNJ.exportML \"$OUTFILE\" then () else OS.FileSys.rename {old = \"$OUTFILE.$ARCH-$OPSYS\", new = \"$OUTFILE\"};"
+ else
+ COMMIT="fun commit () = (ML_System.share_common_data (); ML_System.save_state \"$OUTFILE\");"
+ fi
[ -f "$OUTFILE" ] && { chmod +w "$OUTFILE" || fail_out; }
MLEXIT="commit();"
fi
@@ -87,11 +93,7 @@
## fix heap file name and permissions
if [ -n "$OUTFILE" ]; then
- eval $("$ARCH_N_OPSYS")
- [ -z "$HEAP_SUFFIX" ] && HEAP_SUFFIX="$ARCH-$OPSYS"
- HEAP="$OUTFILE.$HEAP_SUFFIX"
- check_heap_file "$HEAP" && mv "$HEAP" "$OUTFILE" && \
- [ -n "$NOWRITE" ] && chmod -w "$OUTFILE"
+ check_heap_file "$OUTFILE" && [ -n "$NOWRITE" ] && chmod -w "$OUTFILE"
fi
exit "$RC"