Update profile data

- Remove profiles causing proc issues - Update xstartup - Install tigervnc-tools
Slimking99 · Jan 17, 2023 · 1b2e9a9 · 1b2e9a9
1 parent 5cdf9a9
commit 1b2e9a9
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 47 deletions.
diff --git a/APT/LXDE/lxde19.sh b/APT/LXDE/lxde19.sh
@@ -6,21 +6,20 @@ sudo apt-get update
 sudo apt-get install keyboard-configuration -y
 sudo apt-get install tzdata -y
 sudo apt-get install sudo wget nano inetutils-tools dialog -y
-sudo apt-get install lxde-core lxterminal tigervnc-standalone-server tigervnc-common dbus-x11 --no-install-recommends -y
+sudo apt-get install lxde-core lxterminal tigervnc-standalone-server tigervnc-common tigervnc-tools dbus-x11 --no-install-recommends -y
 sudo apt-get clean
 
 #Setup the necessary files
 mkdir -p ~/.vnc
 
 echo "#!/bin/bash
-[ -r $HOME/.Xresources ] && xrdb $HOME/.Xresources
 export PULSE_SERVER=127.0.0.1
-XAUTHORITY=$HOME/.Xauthority
-export XAUTHORITY                                                         
 LANG=en_US.UTF-8
 export LANG
+[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup
+[ -r $HOME/.Xresources ] && xrdb $HOME/.Xresources
 echo $$ > /tmp/xsession.pid
-dbus-launch --exit-with-session startlxde &" > ~/.vnc/xstartup
+dbus-launch --exit-with-session /usr/bin/startlxde &" > ~/.vnc/xstartup
 
 echo " "
 

diff --git a/APT/LXDE/xstartup b/APT/LXDE/xstartup
@@ -1,3 +1,8 @@
 #!/bin/bash
-xrdb $HOME/.Xresources
-startlxde
+export PULSE_SERVER=127.0.0.1
+LANG=en_US.UTF-8
+export LANG
+[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup
+[ -r $HOME/.Xresources ] && xrdb $HOME/.Xresources
+echo $$ > /tmp/xsession.pid
+dbus-launch --exit-with-session /usr/bin/startlxde &
diff --git a/APT/LXQT/lxqt19.sh b/APT/LXQT/lxqt19.sh
@@ -6,22 +6,20 @@ sudo apt-get update -y
 sudo apt-get install keyboard-configuration -y
 sudo apt-get install tzdata -y
 sudo apt-get install sudo wget nano inetutils-tools dialog -y
-sudo apt-get install lxqt-core lxqt-config qterminal tigervnc-standalone-server dbus-x11 openbox -y
+sudo apt-get install lxqt-core lxqt-config qterminal tigervnc-standalone-server tigervnc-tools dbus-x11 openbox -y
 sudo apt-get install xfe -y
 sudo apt-get clean
 
 #Setup the necessary files
 mkdir -p ~/.vnc
 echo "#!/bin/bash
-[ -r $HOME/.Xresources ] && xrdb $HOME/.Xresources
 export PULSE_SERVER=127.0.0.1
-XAUTHORITY=$HOME/.Xauthority
-export XAUTHORITY                                                         
 LANG=en_US.UTF-8
 export LANG
+[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup
+[ -r $HOME/.Xresources ] && xrdb $HOME/.Xresources
 echo $$ > /tmp/xsession.pid
-dbus-launch --exit-with-session startlxqt &" > ~/.vnc/xstartup
-
+dbus-launch --exit-with-session /usr/bin/startxfce4 &"  > ~/.vnc/xstartup
 echo " "
 
 echo "Running browser patch"

diff --git a/APT/XFCE4/xfce19.sh b/APT/XFCE4/xfce19.sh
@@ -9,7 +9,7 @@ sudo apt-mark hold udisks2
 sudo apt-get install keyboard-configuration -y
 sudo apt-get install tzdata -y
 sudo apt-get install sudo wget nano inetutils-tools dialog -y
-sudo apt-get install xfce4 xfce4-goodies xfce4-terminal exo-utils tigervnc-standalone-server tigervnc-common dbus-x11 --no-install-recommends -y
+sudo apt-get install xfce4 xfce4-goodies xfce4-terminal exo-utils tigervnc-standalone-server tigervnc-common tigervnc-tools dbus-x11 --no-install-recommends -y
 sudo apt-get clean
 mkdir -p ~/.vnc
 wget https://raw.githubusercontent.com/Techriz/AndronixOrigin/master/APT/XFCE4/xstartup -P ~/.vnc/
@@ -19,16 +19,6 @@ chmod +x /usr/local/bin/vncserver-start
 chmod +x /usr/local/bin/vncserver-stop
 chmod +x ~/.vnc/xstartup
 
-echo '#!/bin/bash
-[ -r $HOME/.Xresources ] && xrdb $HOME/.Xresources
-export PULSE_SERVER=127.0.0.1
-XAUTHORITY=$HOME/.Xauthority
-export XAUTHORITY                                                         
-LANG=en_US.UTF-8
-export LANG
-echo $$ > /tmp/xsession.pid
-dbus-launch --exit-with-session startxfce4 &' > ~/.vnc/xstartup
-
 echo " "
 
 echo "Running browser patch"

diff --git a/APT/XFCE4/xstartup b/APT/XFCE4/xstartup
@@ -1,3 +1,8 @@
 #!/bin/bash
-xrdb $HOME/.Xresources
-startxfce4
+export PULSE_SERVER=127.0.0.1
+LANG=en_US.UTF-8
+export LANG
+[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup
+[ -r $HOME/.Xresources ] && xrdb $HOME/.Xresources
+echo $$ > /tmp/xsession.pid
+dbus-launch --exit-with-session /usr/bin/startxfce4 &
diff --git a/Installer/Ubuntu22/ubuntu22-awesome.sh b/Installer/Ubuntu22/ubuntu22-awesome.sh
@@ -220,15 +220,12 @@ EOM
 mkdir -p ubuntu22-fs/var/tmp
 rm -rf ubuntu22-fs/usr/local/bin/*
 
-wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/.profile -O ubuntu22-fs/root/.profile.1 > /dev/null
-cat $folder/root/.profile.1 >> $folder/root/.profile && rm -rf $folder/root/.profile.1
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vnc -P ubuntu22-fs/usr/local/bin > /dev/null
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vncpasswd -P ubuntu22-fs/usr/local/bin > /dev/null
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vncserver-stop -P ubuntu22-fs/usr/local/bin > /dev/null
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vncserver-start -P ubuntu22-fs/usr/local/bin > /dev/null
 
 chmod +x ubuntu22-fs/root/.bash_profile
-chmod +x ubuntu22-fs/root/.profile
 chmod +x ubuntu22-fs/usr/local/bin/vnc
 chmod +x ubuntu22-fs/usr/local/bin/vncpasswd
 chmod +x ubuntu22-fs/usr/local/bin/vncserver-start

diff --git a/Installer/Ubuntu22/ubuntu22-i3.sh b/Installer/Ubuntu22/ubuntu22-i3.sh
@@ -220,15 +220,12 @@ EOM
 mkdir -p ubuntu22-fs/var/tmp
 rm -rf ubuntu22-fs/usr/local/bin/*
 
-wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/.profile -O ubuntu22-fs/root/.profile.1 > /dev/null
-cat $folder/root/.profile.1 >> $folder/root/.profile && rm -rf $folder/root/.profile.1
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vnc -P ubuntu22-fs/usr/local/bin > /dev/null
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vncpasswd -P ubuntu22-fs/usr/local/bin > /dev/null
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vncserver-stop -P ubuntu22-fs/usr/local/bin > /dev/null
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vncserver-start -P ubuntu22-fs/usr/local/bin > /dev/null
 
 chmod +x ubuntu22-fs/root/.bash_profile
-chmod +x ubuntu22-fs/root/.profile
 chmod +x ubuntu22-fs/usr/local/bin/vnc
 chmod +x ubuntu22-fs/usr/local/bin/vncpasswd
 chmod +x ubuntu22-fs/usr/local/bin/vncserver-start

diff --git a/Installer/Ubuntu22/ubuntu22-lxde.sh b/Installer/Ubuntu22/ubuntu22-lxde.sh
@@ -219,14 +219,11 @@ EOM
 mkdir -p ubuntu22-fs/var/tmp
 rm -rf ubuntu22-fs/usr/local/bin/*
 echo "127.0.0.1 localhost localhost" > $folder/etc/hosts
-wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/.profile -O ubuntu22-fs/root/.profile.1 > /dev/null
-cat $folder/root/.profile.1 >> $folder/root/.profile && rm -rf $folder/root/.profile.1
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vnc -P ubuntu22-fs/usr/local/bin > /dev/null
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vncpasswd -P ubuntu22-fs/usr/local/bin > /dev/null
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vncserver-stop -P ubuntu22-fs/usr/local/bin > /dev/null
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vncserver-start -P ubuntu22-fs/usr/local/bin > /dev/null
 
-chmod +x ubuntu22-fs/root/.profile
 chmod +x ubuntu22-fs/usr/local/bin/vnc
 chmod +x ubuntu22-fs/usr/local/bin/vncpasswd
 chmod +x ubuntu22-fs/usr/local/bin/vncserver-start

diff --git a/Installer/Ubuntu22/ubuntu22-lxqt.sh b/Installer/Ubuntu22/ubuntu22-lxqt.sh
@@ -221,15 +221,12 @@ EOM
 mkdir -p ubuntu22-fs/var/tmp
 rm -rf ubuntu22-fs/usr/local/bin/*
 echo "127.0.0.1 localhost localhost" > $folder/etc/hosts
-wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/.profile -O ubuntu22-fs/root/.profile.1 > /dev/null
-cat $folder/root/.profile.1 >> $folder/root/.profile && rm -rf $folder/root/.profile.1
 
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vnc -P ubuntu22-fs/usr/local/bin > /dev/null
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vncpasswd -P ubuntu22-fs/usr/local/bin > /dev/null
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vncserver-stop -P ubuntu22-fs/usr/local/bin > /dev/null
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vncserver-start -P ubuntu22-fs/usr/local/bin > /dev/null
 
-chmod +x ubuntu22-fs/root/.profile
 chmod +x ubuntu22-fs/usr/local/bin/vnc
 chmod +x ubuntu22-fs/usr/local/bin/vncpasswd
 chmod +x ubuntu22-fs/usr/local/bin/vncserver-start

diff --git a/Installer/Ubuntu22/ubuntu22-openbox.sh b/Installer/Ubuntu22/ubuntu22-openbox.sh
@@ -222,15 +222,12 @@ EOM
 mkdir -p ubuntu22-fs/var/tmp
 rm -rf ubuntu22-fs/usr/local/bin/*
 
-wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/.profile -O ubuntu22-fs/root/.profile.1 > /dev/null
-cat $folder/root/.profile.1 >> $folder/root/.profile && rm -rf $folder/root/.profile.1
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vnc -P ubuntu22-fs/usr/local/bin > /dev/null
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vncpasswd -P ubuntu22-fs/usr/local/bin > /dev/null
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vncserver-stop -P ubuntu22-fs/usr/local/bin > /dev/null
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vncserver-start -P ubuntu22-fs/usr/local/bin > /dev/null
 
 chmod +x ubuntu22-fs/root/.bash_profile
-chmod +x ubuntu22-fs/root/.profile
 chmod +x ubuntu22-fs/usr/local/bin/vnc
 chmod +x ubuntu22-fs/usr/local/bin/vncpasswd
 chmod +x ubuntu22-fs/usr/local/bin/vncserver-start

diff --git a/Installer/Ubuntu22/ubuntu22-xfce.sh b/Installer/Ubuntu22/ubuntu22-xfce.sh
@@ -221,14 +221,11 @@ EOM
 mkdir -p ubuntu22-fs/var/tmp
 rm -rf ubuntu22-fs/usr/local/bin/*
 echo "127.0.0.1 localhost localhost" > $folder/etc/hosts
-wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/.profile -O ubuntu22-fs/root/.profile.1 > /dev/null
-cat $folder/root/.profile.1 >> $folder/root/.profile && rm -rf $folder/root/.profile.1
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vnc -P ubuntu22-fs/usr/local/bin > /dev/null
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vncpasswd -P ubuntu22-fs/usr/local/bin > /dev/null
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vncserver-stop -P ubuntu22-fs/usr/local/bin > /dev/null
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vncserver-start -P ubuntu22-fs/usr/local/bin > /dev/null
 
-chmod +x ubuntu22-fs/root/.profile
 chmod +x ubuntu22-fs/usr/local/bin/vnc
 chmod +x ubuntu22-fs/usr/local/bin/vncpasswd
 chmod +x ubuntu22-fs/usr/local/bin/vncserver-start

diff --git a/Installer/Ubuntu22/ubuntu22.sh b/Installer/Ubuntu22/ubuntu22.sh
@@ -220,15 +220,12 @@ EOM
 mkdir -p ubuntu22-fs/var/tmp
 rm -rf ubuntu22-fs/usr/local/bin/*
 
-wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/.profile -O ubuntu22-fs/root/.profile.1
-cat $folder/root/.profile.1 >> $folder/root/.profile && rm -rf $folder/root/.profile.1
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vnc -P ubuntu22-fs/usr/local/bin
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vncpasswd -P ubuntu22-fs/usr/local/bin
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vncserver-stop -P ubuntu22-fs/usr/local/bin
 wget -q https://raw.githubusercontent.com/AndronixApp/AndronixOrigin/master/Rootfs/Ubuntu19/vncserver-start -P ubuntu22-fs/usr/local/bin
 
 chmod +x ubuntu22-fs/root/.bash_profile
-chmod +x ubuntu22-fs/root/.profile
 chmod +x ubuntu22-fs/usr/local/bin/vnc
 chmod +x ubuntu22-fs/usr/local/bin/vncpasswd
 chmod +x ubuntu22-fs/usr/local/bin/vncserver-start