From 7160c4b19c14b337b0f85a497c846ec5f99efd96 Mon Sep 17 00:00:00 2001 From: Suhan G Paradkar <76830230+suhan-paradkar@users.noreply.github.com> Date: Mon, 24 May 2021 12:14:18 +0530 Subject: [PATCH 1/5] Update README.md --- README.md | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 087cc67b4..52e8c87f5 100644 --- a/README.md +++ b/README.md @@ -91,6 +91,7 @@ x11, no es una distribución proot > ejecutar las apps de una distro proot en termux x11! > Un ejemplo : +``` ./start-ubuntu.sh apt install firefox @@ -98,6 +99,7 @@ apt install firefox export DISPLAY=:1 firefox +``` ### puede ejecutar apps proot sin problemas @@ -109,19 +111,15 @@ firefox ⚠ Solo en termux +``` cd $HOME - pkg update && pkg upgrade - pkg install git - pkg install wget - git clone https://github.com/Yisus7u7/termux-desktop-xfce - cd termux-desktop-xfce - bash install-desktop-xfce.sh +``` > luego de eso solo espere, el script hará su trabajo @@ -129,11 +127,10 @@ bash install-desktop-xfce.sh usa el comando : +``` startdesktop - -O - vncserver -listen tcp +``` Pará iniciar el servidor vnc, conectese a localhost:1 O el puerto que haya indicado la terminal @@ -145,26 +142,26 @@ https://github.com/Yisus7u7/termux-desktop-xfce/issues Para actualizar solo es ejecutar : +``` cd ~/termux-desktop-xfce - git pull - bash update-desktop.sh +``` Listo! -`nota: si la carpeta no existe o usted la eliminó +nota: si la carpeta no existe o usted la eliminó para liberar espacio entonces debe seguir estos -pasos:` +pasos: + para actualizar solo ejecute : +``` cd $HOME - git clone https://github.com/Yisus7u7/termux-desktop-xfce - cd termux-desktop-xfce - bash update-desktop.sh +``` `Espero que te guste este pequeño trabajo, No olvides dejar tu 🌟 y compartir :3` From 33571b766006b20da60276bced186e084b6436a4 Mon Sep 17 00:00:00 2001 From: Suhan G Paradkar <76830230+suhan-paradkar@users.noreply.github.com> Date: Mon, 24 May 2021 12:37:38 +0530 Subject: [PATCH 2/5] Code formatting --- install-desktop-xfce.sh | 91 ++--------------------------------------- 1 file changed, 4 insertions(+), 87 deletions(-) diff --git a/install-desktop-xfce.sh b/install-desktop-xfce.sh index 89c697c30..f7e5308e0 100755 --- a/install-desktop-xfce.sh +++ b/install-desktop-xfce.sh @@ -30,132 +30,49 @@ echo -e '\e[1;36m installing xfce4 and basic apps...\e[1m' sleep 1 pkg update && pkg upgrade - pkg install -y x11-repo - -pkg install -y xfce4 - -pkg install -y xfce4-taskmanager - -pkg install -y xfce4-whiskermenu-plugin - -pkg install -y xfce4-clipman-plugin - -pkg install -y xarchiver - -pkg install -y tigervnc - -pkg install -y geany - -pkg install -y geany-plugins - -pkg install -y gtk3 gtk2 mtpaint - -pkg install -y leafpad hexchat - -pkg install -y netsurf recordmydesktop - -pkg install -y feh - -pkg install -y dosbox - -pkg install -y xfce4-terminal - -pkg install -y python-tkinter - -pkg install -y htop - -pkg install -y neofetch - -pkg install -y loqui - -pkg install -y neovim - -pkg install -y vim-gtk - -pkg install -y the-powder-toy - -pkg install -y galculator - -pkg install -y xorg-xhost - -pkg install -y mpv - -pkg install -y tumbler - -pkg install -y ristretto - -pkg install -y - +pkg install -y xfce4 xfce4-taskmanager dosbox xfce4-terminal python-tkinter htop neofetch loqui vim-gtk the-powder-toy galculator xorg-xhost mpv ristretto xfce4-whiskermenu-plugin xfce4-clipman-plugin xarchiver tigervnc geany geany-plugins gtk3 gtk2 mtpaint leafpad hexchat netsurf recordmydesktop feh clear echo -e '\e[1;31mSetting up vnc server ...\e[1m' sleep 3 + #setting folders -rm -rf $HOME/.vnc +rm -rf $HOME/.vnc mv $HOME/.config $HOME/.config.old - rm -rf $HOME/.icons - rm -rf $HOME/.themes - mv ./music $PREFIX/bin/music #installing dotfiles clear - -echo "espere un momento...." - +echo "Wait a sec...." cp -rf $HOME/termux-desktop-xfce/music $PREFIX/bin - cp -rf $HOME/termux-desktop-xfce/startdesktop $PREFIX/bin - cp -rf $HOME/termux-desktop-xfce/backgrounds $HOME - cp -rf $HOME/termux-desktop-xfce/.icons $HOME - cp -rf $HOME/termux-desktop-xfce/.themes $HOME - cp -rf $HOME/termux-desktop-xfce/.vnc $HOME - cp -rf $HOME/termux-desktop-xfce/.config $HOME - mkdir $HOME/Desktop - mkdir $HOME/Downloads - mkdir $HOME/Templates - mkdir $HOME/Public - mkdir $HOME/Documents - mkdir $HOME/Pictures - mkdir $HOME/Video - cp -rf $HOME/termux-desktop-xfce/README.desktop $HOME/Desktop - termux-setup-storage - cd $HOME - ln -s $HOME/storage/music Music - mkdir $HOME/Music - cd $HOME/.icons - bash install-papirus.sh - cd $HOME - echo -e """\e[1;32menjoy!! To start the vnc server, use the command: vncserver or startdesktop to stop it, use the command: vncserver -kill: 1 Replace the: 1 with the port on which the vnc service is running\e[1m""" exit - - From a5a1c0ceb2782e796fefcf090d7b8342fb44b3b6 Mon Sep 17 00:00:00 2001 From: Suhan G Paradkar <76830230+suhan-paradkar@users.noreply.github.com> Date: Mon, 24 May 2021 12:46:41 +0530 Subject: [PATCH 3/5] Update update-desktop.sh --- update-desktop.sh | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/update-desktop.sh b/update-desktop.sh index 1f7544419..9c2bbe6bd 100755 --- a/update-desktop.sh +++ b/update-desktop.sh @@ -8,46 +8,22 @@ sleep 5 #install new packages -pkg install -y ristretto - -pkg install -y tumbler - -pkg install -y mpv - -pkg install -y python-tkinter - -pkg install -y geany-plugins - -pkg install -y xfce4-taskmanager - -pkg install -y xfce4-whiskermenu-plugin - -pkg install -y xfce4-clipman-plugin +pkg up +git pull #configuring update rm -rf $PREFIX/bin/music - rm -rf $PREFIX/startdesktop - cp -rf $HOME/termux-desktop-xfce/music $PREFIX/bin - cp -rf $HOME/termux-desktop-xfce/startdesktop $PREFIX/bin - rm -rf $HOME/.config.old - cp -rf $HOME/.config $HOME/.config.old - rm -rf $HOME/.config - cp -rf $HOME/termux-desktop-xfce/.config $HOME - cp -rf $HOME/termux-desktop-xfce/README.desktop $HOME/Desktop - cp -rf $HOME/termux-desktop-xfce/.icons/* $HOME/.icons/ - cp -rf $HOME/termux-desktop-xfce/.themes/* $HOME/.themes/ - cp -rf $HOME/termux-desktop-xfce/backgrounds/* $HOME/backgrounds/ clear From d89e0e449877a9817f5ffc824ef0e1ecf2ffed17 Mon Sep 17 00:00:00 2001 From: Suhan G Paradkar <76830230+suhan-paradkar@users.noreply.github.com> Date: Mon, 24 May 2021 13:03:12 +0530 Subject: [PATCH 4/5] Create compile-install.sh --- compile-install.sh | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 compile-install.sh diff --git a/compile-install.sh b/compile-install.sh new file mode 100644 index 000000000..68709bf7e --- /dev/null +++ b/compile-install.sh @@ -0,0 +1,25 @@ +#Optional tools that will be compiled on-device + +pkg install perl + +cpan install XML::Parser + +wget https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz +tar -xvf intltool-0.51.0.tar.gz +cd intltool-0.51.0/ +autoreconf -fi +./configure --prefix=$PREFIX +make +make install +cd .. + +wget https://archive.xfce.org/src/xfce/xfce4-dev-tools/4.16/xfce4-dev-tools-4.16.0.tar.bz2 +tar -xvf xfce4-dev-tools-4.16.0.tar.bz2 +cd xfce4-dev-tools-4.16.0/ +autoreconf -fi +./configure --prefix=$PREFIX +make +make install +cd .. + +exit From a38c27ebad392f9d3d9d2f71be185089afd520df Mon Sep 17 00:00:00 2001 From: Suhan G Paradkar <76830230+suhan-paradkar@users.noreply.github.com> Date: Mon, 24 May 2021 13:12:53 +0530 Subject: [PATCH 5/5] Update install-desktop-xfce.sh --- install-desktop-xfce.sh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/install-desktop-xfce.sh b/install-desktop-xfce.sh index f7e5308e0..8dae8723e 100755 --- a/install-desktop-xfce.sh +++ b/install-desktop-xfce.sh @@ -66,13 +66,19 @@ mkdir $HOME/Pictures mkdir $HOME/Video cp -rf $HOME/termux-desktop-xfce/README.desktop $HOME/Desktop termux-setup-storage -cd $HOME -ln -s $HOME/storage/music Music -mkdir $HOME/Music -cd $HOME/.icons -bash install-papirus.sh -cd $HOME +ln -s $HOME/storage/music $HOME/Music + +bash $HOME/.icons/install-papirus.sh + +read -p "\e[1; Do you want to compile extra plugins on-device??[y/n]" in + +if [[ $in -eq y]] +then + bash compile-install.sh + echo -e """\e[1;32menjoy!! + To start the vnc server, use the command: vncserver or startdesktop to stop it, use the command: vncserver -kill: 1 Replace the: 1 with the port on which the vnc service is running\e[1m""" + +else echo -e """\e[1;32menjoy!! To start the vnc server, use the command: vncserver or startdesktop to stop it, use the command: vncserver -kill: 1 Replace the: 1 with the port on which the vnc service is running\e[1m""" - exit