Make tool/emcc.sh.in Bourne-friendly.

FossilOrigin-Name: a69ab88474a7b917679633e366364b05a99c348dabc37f1bbc5010f7005d5500

diff --git a/manifest b/manifest
index 45d994c0f6204a202a6584179c9ba55518de7af7..ab28b01f141636dfdae111a6d22e0d6ba7eb8909 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\strunk\sinto\sautosetup\sbranch.
-D 2024-10-05T12:06:31.859
+C Make\stool/emcc.sh.in\sBourne-friendly.
+D 2024-10-08T16:05:54.098
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -2132,7 +2132,7 @@ F tool/custom.txt 6cdf298f43e1db4bb91406d14777669b8fb1df790837823fa6754c4308decc
 F tool/dbhash.c 5da0c61032d23d74f2ab84ffc5740f0e8abec94f2c45c0b4306be7eb3ae96df0
 F tool/dbtotxt.c ca48d34eaca6d6b6e4bd6a7be2b72caf34475869054240244c60fa7e69a518d6
 F tool/dbtotxt.md c9a57af8739957ef36d2cfad5c4b1443ff3688ed33e4901ee200c8b651f43f3c
-F tool/emcc.sh.in bc3f3a29f5a7272afe605a483d6463617f27d31c74fa9135c7eaa3b844345b74
+F tool/emcc.sh.in ccd415e9784d8efdb6e29bd2289bff57d37a928122620a244fcb99f445ae276c
 F tool/enlargedb.c 3e8b2612b985cfa7e3e8800031ee191b43ae80de96abb5abbd5eada62651ee21
 F tool/extract-sqlite3h.tcl 069ceab0cee26cba99952bfa08c0b23e35941c837acabe143f0c355d96c9e2eb x
 F tool/extract.c 054069d81b095fbdc189a6f5d4466e40380505e2
@@ -2235,8 +2235,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 6838b7b5d6130b1e0af9a71ad2c5922b1ef35f082907dffeed03811e1e62406f 2f7eab381e16760952d1c90a9119d2a217933f0136442d8f6eeb6d95e366ca4f
-R 718af76a1b8b829ff662e805c69f5727
+P 6cbb05fde1b74ced6d56d6ec7f815c989697381531175daccebc4311bfef61d9
+R 2c8a1ade7d9f0039a6c4438b17ebd26a
 U stephan
-Z d5ebe1dc79c6b40a021966341f66c463
+Z 1d93be3fe611f8efdba1c2ce6cdf2d85
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 13b38ba8244e78e5e915b8442c9da070c12462fd..e1bdceaadb73720856d41b6ce1588f8939272ea1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6cbb05fde1b74ced6d56d6ec7f815c989697381531175daccebc4311bfef61d9
+a69ab88474a7b917679633e366364b05a99c348dabc37f1bbc5010f7005d5500

diff --git a/tool/emcc.sh.in b/tool/emcc.sh.in
index 91ed6a2c279a44bc5afa954d0afa8f0618029eb2..3edc65fb42b7702ad09ea8c51f88550bf9edda8f 100644 (file)
--- a/tool/emcc.sh.in
+++ b/tool/emcc.sh.in
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash
+#!/bin/sh
+# ^^^^^^^ Please try to keep this script Bourne-compatible.
 ########################################################################
 # WARNING: emcc.sh is generated from emcc.sh.in by the configure
 # process. Do not edit emcc.sh directly, as it may be deleted or
@@ -16,7 +17,7 @@ EMSDK_ENV="@EMSDK_ENV@"
 emcc="@BIN_EMCC@"
 
 if [x = "x${emcc}" ]; then
-    emcc=$(which emcc 2>/dev/null)
+    emcc=`which emcc 2>/dev/null`
 fi
 
 if [ x = "x${emcc}" ]; then
@@ -53,9 +54,9 @@ if [ x = "x${emcc}" ]; then
       exit $rc
     }
   fi
-  emcc=$(which emcc 2>/dev/null)
+  emcc=`which emcc 2>/dev/null`
   if [ x = "x${emcc}" ]; then
-    echo "emcc not found in PATH. Normally that's set up by EMSDK_ENV." 1>&2
+    echo "emcc not found in PATH. Normally that's set up by ${EMSDK_ENV}." 1>&2
     exit 4
   fi
 fi