From b320150b807ba6eb573d008d57ac7506e490270d Mon Sep 17 00:00:00 2001
From: Devin Dice <bpapilot@gmail.com>
Date: Sun, 15 Jan 2023 13:42:40 -0500
Subject: [PATCH] Fixes

---
 rootfs/cloud9/bashrc.default | 2 ++
 rootfs/startup.sh            | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/rootfs/cloud9/bashrc.default b/rootfs/cloud9/bashrc.default
index 4cbbb13..8ceb4cb 100644
--- a/rootfs/cloud9/bashrc.default
+++ b/rootfs/cloud9/bashrc.default
@@ -17,6 +17,8 @@ shopt -s histappend
 export PROMPT_COMMAND="history -a; history -c; history -r; $PROMPT_COMMAND"
 #export HISTFILE=$HOME/.bash_history
 
+# Show date and time in history
+HISTTIMEFORMAT="%Y-%m-%d %T - "
 
 # for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
 HISTSIZE=10000
diff --git a/rootfs/startup.sh b/rootfs/startup.sh
index a7e3f5c..daa7514 100755
--- a/rootfs/startup.sh
+++ b/rootfs/startup.sh
@@ -40,7 +40,6 @@ if [ "$USER" != "root" ]; then
     echo "* enable custom user: $USER"
     #useradd --create-home --shell /bin/bash --user-group --groups adm,sudo,docker -d /workspace/.home/$USER $USER
     useradd --create-home --shell /bin/bash --user-group --groups adm,sudo,docker $(if [ ! $PUID == "" ]; then echo "--uid $PUID"; fi) $(if [ ! $PGID == "" ]; then echo "--gid $PGID"; fi) $USER
-    chown -R $USER:$USER /home/$USER
 
     if [ -z "$PASSWORD" ]; then
         echo "  set default password to \"ubuntu\""
@@ -112,10 +111,10 @@ fi
 #chown $USER:$USER /workspace/.c9
 
  
+chown -R $USER:$USER /home/$USER
 
 
-
-#sudo -H -u $USER bash -c 'bash /cloud9/user-install.sh' 2>&1> /home/$USER/.cloud9-install.log &
+sudo -H -u $USER bash -c 'bash /cloud9/user-install.sh' 2>&1> /home/$USER/.cloud9-install.log &
 
 # Only for testing while editing the menu
 #chown $USER /usr/share/applications/
@@ -162,4 +161,5 @@ if [ -n "$SEARCHDOMAIN" ]; then
     echo "search $SEARCHDOMAIN" >> /etc/resolv.conf
 fi
 
+chown -R $USER:$USER /home/$USER
 exec /bin/tini -- supervisord -n -c /etc/supervisor/supervisord.conf