From ed9956a6369fe10e0ac13ed580a9ab5e1ce48f4e Mon Sep 17 00:00:00 2001
From: Devin Dice <bpapilot@gmail.com>
Date: Fri, 13 Jan 2023 15:19:45 -0500
Subject: [PATCH] Fixes

---
 rootfs/etc/resolv.conf |  3 ---
 rootfs/startup.sh      | 12 +++++-------
 2 files changed, 5 insertions(+), 10 deletions(-)
 delete mode 100644 rootfs/etc/resolv.conf

diff --git a/rootfs/etc/resolv.conf b/rootfs/etc/resolv.conf
deleted file mode 100644
index f197f09..0000000
--- a/rootfs/etc/resolv.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-%nameserver%
-%searchdomain%
-options ndots:0
\ No newline at end of file
diff --git a/rootfs/startup.sh b/rootfs/startup.sh
index 72551ac..9d8f292 100755
--- a/rootfs/startup.sh
+++ b/rootfs/startup.sh
@@ -26,7 +26,7 @@ if [ -n "$TZ" ]; then
 fi
 
 if [ -n "$FILE_SHARE" ]; then
-    FILE_SHARE=_SHARED_FILES_
+    FILE_SHARE=_Shared_Files_
 fi
 
 #sed -i "s#/usr/share/backgrounds.*#/usr/share/backgrounds/default.png\"/>#g" /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
@@ -129,7 +129,7 @@ bash /cloud9/configure_desktop.sh &
 
 mkdir -p /home/$USER/Workspace/$FILE_SHARE
 grep -qxF "/home/$USER/Workspace /workspace none defaults,bind 0 0" /etc/fstab || echo "/home/$USER/Workspace /workspace none defaults,bind 0 0" >> /etc/fstab
-grep -qxF "/home/$USER/Workspace/_Shared_Files_ /workspace/$FILE_SHARE none defaults,bind 0 0" /etc/fstab || echo "/home/$USER/Workspace/$FILE_SHARE /workspace/$FILE_SHARE none defaults,bind 0 0" >> /etc/fstab
+grep -qxF "/home/$USER/Workspace/$FILE_SHARE /workspace/$FILE_SHARE none defaults,bind 0 0" /etc/fstab || echo "/home/$USER/Workspace/$FILE_SHARE /workspace/$FILE_SHARE none defaults,bind 0 0" >> /etc/fstab
 mount -a
 
 # Make directory for bookmarks
@@ -149,15 +149,13 @@ if [ -n "$HOSTNAME" ]; then
 fi
 
 if [ -n "$NAMESERVER" ]; then
-    sed -i "s/%nameserver%/nameserver $NAMESERVER/" /etc/resolv.conf
+    echo "nameserver $NAMESERVER" > /etc/resolv.conf
 else
-    sed -i "s/%nameserver%/nameserver 127.0.0.11/" /etc/resolv.conf
+    echo "nameserver 127.0.0.11" > /etc/resolv.conf
 fi
 
 if [ -n "$SEARCHDOMAIN" ]; then
-    sed -i "s/%searchdomain%/search $SEARCHDOMAIN/" /etc/resolv.conf
-else
-    sed -i "s/%searchdomain%/" /etc/resolv.conf
+    echo "search $SEARCHDOMAIN" >> /etc/resolv.conf
 fi
 
 exec /bin/tini -- supervisord -n -c /etc/supervisor/supervisord.conf