diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2020-07-03 01:54:58 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2020-07-03 02:06:45 (EDT) |
| commit | 66c3162f152c9befa0b2ee032300b526a3240d23 (patch) | |
| tree | e2b9992926f5abbc40c4d38410d4a22363e1c666 | |
| parent | c03edb6df96f60dcc13c73cce67e86075ac91961 (diff) | |
time(): Rename to unixtime()
In GNU Bash, time is not simply a built-in utility, but actually a
reserved word. Naming a function "time" results in a rather unhelpful
syntax error message.
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | src/install.sh | 2 | ||||
| -rw-r--r-- | src/main.sh | 4 |
3 files changed, 7 insertions, 4 deletions
@@ -17,7 +17,7 @@ New features: to install a new system of the same architecture and platform and copy its opkg configuration into the old system. -Error handling: +Error handling and bug fixes: * "prokit shell", "prokit opkg", and "prokit build" now pass through relevant exit statuses. "prokit build" also no longer tries to run @@ -25,6 +25,9 @@ Error handling: * If prokit received a signal while running a command under chroot, it could have failed to unmount a file system on a block device. This has been improved. + * An incompatibility with GNU Bash, Z shell, KornShell, MirBSD Korn + Shell, and possibly others (except Almquist shell derivatives DASH + and BusyBox ash) present since prokit version 2.0.0 has been fixed. ProteanOS Development Kit version 2.0.1 --------------------------------------- diff --git a/src/install.sh b/src/install.sh index 41c217f..ab2977b 100644 --- a/src/install.sh +++ b/src/install.sh @@ -294,7 +294,7 @@ install_get_pkgs() done <"${root}/$(profile_opkg_state_dir \ )/info/${pkg}.conffiles" fi - printf 'Installed-Time: %d\n\n' $(time) >&${status_fd} + printf 'Installed-Time: %d\n\n' $(unixtime) >&${status_fd} rm -f -- "${root}/${fname}" done diff --git a/src/main.sh b/src/main.sh index 0f850e0..aa9b3d4 100644 --- a/src/main.sh +++ b/src/main.sh @@ -34,7 +34,7 @@ else builddir='' fi -time() +unixtime() { # Based on code from <https://www.etalabs.net/sh_tricks.html> by Rich # Felker, with whitespace added for readability. @@ -79,7 +79,7 @@ main() shift 1 fi - srand $((${$} + $(time))) + srand $((${$} + $(unixtime))) if ! init_vardata; then return 2 fi |