From d300f4fb6d85d848e7d726ba5a3fb4440364df06 Mon Sep 17 00:00:00 2001 From: "Donald A. Cupp Jr." Date: Wed, 30 Oct 2024 08:18:02 -0500 Subject: [PATCH] modified: ts/build/packages/base/etc/thinstation.exports modified: ts/build/packages/installer/bin/installer modified: ts/build/packages/xfwm4/build/extra/etc/xfwm4.functions --- ts/build/packages/base/etc/thinstation.exports | 1 - ts/build/packages/installer/bin/installer | 4 +++- ts/build/packages/xfwm4/build/extra/etc/xfwm4.functions | 7 +++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ts/build/packages/base/etc/thinstation.exports b/ts/build/packages/base/etc/thinstation.exports index 1bc55eb76c..1059f9d1b8 100644 --- a/ts/build/packages/base/etc/thinstation.exports +++ b/ts/build/packages/base/etc/thinstation.exports @@ -15,7 +15,6 @@ DEVICE DISPLAY FILESYSTEMS HALTONERROR -HOME ICONMODE KEYBOARD_MAP LANG diff --git a/ts/build/packages/installer/bin/installer b/ts/build/packages/installer/bin/installer index 7588c19436..5d44571e45 100755 --- a/ts/build/packages/installer/bin/installer +++ b/ts/build/packages/installer/bin/installer @@ -453,7 +453,8 @@ cred_dialog() ' set +x result=`$GTKDIALOG` - for statement in `echo $result`;do + IFS=$'\n' + for statement in $result;do eval $statement done if [ "$EXIT" != "ok" ]; then @@ -469,6 +470,7 @@ set +x x_echo "Error" "All fields are required. Please enter all details." STATUS="incomplete" fi + unset IFS set -x done } diff --git a/ts/build/packages/xfwm4/build/extra/etc/xfwm4.functions b/ts/build/packages/xfwm4/build/extra/etc/xfwm4.functions index e7f3381cf2..1f88a758f2 100644 --- a/ts/build/packages/xfwm4/build/extra/etc/xfwm4.functions +++ b/ts/build/packages/xfwm4/build/extra/etc/xfwm4.functions @@ -1,6 +1,13 @@ #exec >/var/log/xfwm4.log 2>&1 #set -x +TSUSER="`id -un`" +if [ "$TSUSER" != "root" ]; then + HOME=/home/$TSUSER +else + HOME=/root +fi + make_desktop() { mkdir -p "$ICONDIR"