| 1 | Author: Danny Milosavljevic <[email protected]>
|
| 2 | Date: 2026-03-31
|
| 3 | Subject: Make nativeexecution helper work with Guix
|
| 4 |
|
| 5 | diff -urN orig/ide/dlight.nativeexecution/release/bin/nativeexecution/dorun.sh mod/ide/dlight.nativeexecution/release/bin/nativeexecution/dorun.sh
|
| 6 | |
| 7 | |
| 8 | @@ -16,8 +16,8 @@
|
| 9 | # specific language governing permissions and limitations
|
| 10 | # under the License.
|
| 11 |
|
| 12 | -PATH=/bin:/usr/bin
|
| 13 | -PROG=`basename "$0"`
|
| 14 | +PATH="${PATH:+$PATH:}/bin:/usr/bin"
|
| 15 | +PROG="${0##*/}"
|
| 16 | USAGE="usage: ${PROG} [-p prompt] -x execScript"
|
| 17 | PROMPT=NO
|
| 18 | STATUS=-1
|
| 19 | @@ -43,7 +43,7 @@
|
| 20 | esac
|
| 21 | done
|
| 22 |
|
| 23 | -shift `expr $OPTIND - 1`
|
| 24 | +shift "$((OPTIND - 1))"
|
| 25 |
|
| 26 | trap "doExit" 1 2 15 EXIT
|
| 27 |
|
| 28 | diff -urN orig/ide/dlight.nativeexecution/release/bin/nativeexecution/hostinfo.sh mod/ide/dlight.nativeexecution/release/bin/nativeexecution/hostinfo.sh
|
| 29 | |
| 30 | |
| 31 | @@ -16,13 +16,13 @@
|
| 32 | # specific language governing permissions and limitations
|
| 33 | # under the License.
|
| 34 |
|
| 35 | -PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
|
| 36 | +PATH="${PATH:+$PATH:}/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"
|
| 37 | HOSTNAME=`uname -n`
|
| 38 | OS=`uname -s`
|
| 39 | CPUTYPE=`uname -p`
|
| 40 | BITNESS=32
|
| 41 |
|
| 42 | -LS=/bin/ls
|
| 43 | +LS=ls
|
| 44 | OSFAMILY=
|
| 45 | DATETIME=`date -u +'%Y-%m-%d %H:%M:%S'`
|
| 46 |
|
| 47 | @@ -139,7 +139,7 @@
|
| 48 | echo "Warning: TMPDIRBASE is not writable: ${TMPDIRBASE}">&2
|
| 49 | SUFFIX=`expr 1 + ${SUFFIX}`
|
| 50 | TMPDIRBASE=${TMPBASE}/dlight_${USER_D}_${SUFFIX}
|
| 51 | - /bin/mkdir -p ${TMPDIRBASE} 2>/dev/null
|
| 52 | + mkdir -p ${TMPDIRBASE} 2>/dev/null
|
| 53 | else
|
| 54 | break
|
| 55 | fi
|
| 56 | @@ -157,7 +157,7 @@
|
| 57 | echo "Warning: TMPDIRBASE is not writable: ${TMPDIRBASE}">&2
|
| 58 | SUFFIX=`expr 1 + ${SUFFIX}`
|
| 59 | TMPDIRBASE=${TMPBASE}/${NB_KEY}_${SUFFIX}
|
| 60 | - /bin/mkdir -p ${TMPDIRBASE} 2>/dev/null
|
| 61 | + mkdir -p ${TMPDIRBASE} 2>/dev/null
|
| 62 | else
|
| 63 | break
|
| 64 | fi
|
| 65 | @@ -174,7 +174,7 @@
|
| 66 |
|
| 67 | ENVFILE="${TMPDIRBASE}/env"
|
| 68 |
|
| 69 | -ID=`LC_MESSAGES=C /usr/bin/id`
|
| 70 | +ID=`LC_MESSAGES=C id`
|
| 71 |
|
| 72 | echo BITNESS=${BITNESS}
|
| 73 | echo CPUFAMILY=${CPUFAMILY}
|