Fixed previous error, need to finish later.

need option menu to have effect an git setup needs to be finished
Importing the GPG and SSH keys need to be done via an secure way, don't yet know how. posibly an encripted file that includes the files.

Signed-off-by: Abel Tim <git@abeltim.com>

4 files changed, 355 insertions, 12 deletions

diff --git a/setup/.gitmessage.txt b/setup/.gitmessage.txt
new file mode 100644
index 0000000..5643ab8
--- /dev/null
+++ b/setup/.gitmessage.txt
@@ -0,0 +1,7 @@
+Subject line (try to keep under 50 characters)
+
+Multi-line description of commit,
+feel free to be detailed.
+Please also include who worked on the commit.
+
+[Issue: X]
diff --git a/setup/.xscreensaver b/setup/.xscreensaver
new file mode 100644
index 0000000..12c548c
--- /dev/null
+++ b/setup/.xscreensaver
@@ -0,0 +1,302 @@
+# XScreenSaver Preferences File
+# Written by xscreensaver-settings 6.09 for abel on Thu May 29 10:17:37 2025.
+# https://www.jwz.org/xscreensaver/
+
+timeout:	12:00:00
+cycle:		0:05:00
+lock:		True
+lockTimeout:	0:10:00
+passwdTimeout:	0:00:30
+visualID:	default
+installColormap:    True
+verbose:	False
+splash:		True
+splashDuration:	0:00:05
+demoCommand:	xscreensaver-settings
+nice:		10
+fade:		False
+unfade:		False
+fadeSeconds:	0:00:03
+ignoreUninstalledPrograms:False
+dpmsEnabled:	False
+dpmsQuickOff:	False
+dpmsStandby:	24:00:00
+dpmsSuspend:	24:00:00
+dpmsOff:	24:00:00
+grabDesktopImages:  False
+grabVideoFrames:    False
+chooseRandomImages: True
+imageDirectory:	https://www.nasa.gov/feeds/iotd-feed
+
+mode:		random
+selected:	-1
+
+textMode:	url
+textLiteral:	XScreenSaver
+textFile:
+textProgram:	fortune
+textURL:	https://feeds.nos.nl/nosnieuwsalgemeen
+dialogTheme:	wine
+settingsGeom:	1,28 -1,-1
+
+programs:								      \
+				maze --root				    \n\
+  GL: 				superquadrics --root			    \n\
+				attraction --root			    \n\
+				blitspin --root				    \n\
+				greynetic --root			    \n\
+				helix --root				    \n\
+				hopalong --root				    \n\
+				imsmap --root				    \n\
+				noseguy --root				    \n\
+				pyro --root				    \n\
+				qix --root				    \n\
+				rocks --root				    \n\
+				rorschach --root			    \n\
+				decayscreen --root			    \n\
+				flame --root				    \n\
+				halo --root				    \n\
+				slidescreen --root			    \n\
+				pedal --root				    \n\
+				bouboule --root				    \n\
+				braid --root				    \n\
+				coral --root				    \n\
+				deco --root				    \n\
+				drift --root				    \n\
+				fadeplot --root				    \n\
+				galaxy --root				    \n\
+				goop --root				    \n\
+				grav --root				    \n\
+				ifs --root				    \n\
+				unicode --root				    \n\
+  GL: 				jigsaw --root				    \n\
+				julia --root				    \n\
+				kaleidescope --root			    \n\
+  GL: 				moebius --root				    \n\
+				moire --root				    \n\
+  GL: 				morph3d --root				    \n\
+				mountain --root				    \n\
+				munch --root				    \n\
+				penrose --root				    \n\
+  GL: 				pipes --root				    \n\
+				rdbomb --root				    \n\
+  GL: 				rubik --root				    \n\
+				sierpinski --root			    \n\
+				slip --root				    \n\
+  GL: 				sproingies --root			    \n\
+				starfish --root				    \n\
+				strange --root				    \n\
+				swirl --root				    \n\
+				triangle --root				    \n\
+				xjack --root				    \n\
+				xlyap --root				    \n\
+  GL: 				atlantis --root				    \n\
+				bsod --root				    \n\
+  GL: 				bubble3d --root				    \n\
+  GL: 				cage --root				    \n\
+				crystal --root				    \n\
+				cynosure --root				    \n\
+				discrete --root				    \n\
+				distort --root				    \n\
+				epicycle --root				    \n\
+				flow --root				    \n\
+  GL: 				glplanet --root				    \n\
+				interference --root			    \n\
+				kumppa --root				    \n\
+  GL: 				lament --root				    \n\
+				moire2 --root				    \n\
+  GL: 				sonar --root				    \n\
+  GL: 				stairs --root				    \n\
+				truchet --root				    \n\
+-				vidwhacker --root			    \n\
+-				webcollage --root			    \n\
+				blaster --root				    \n\
+				bumps --root				    \n\
+				ccurve --root				    \n\
+				compass --root				    \n\
+				deluxe --root				    \n\
+				demon --root				    \n\
+  GL: 				extrusion --root			    \n\
+				loop --root				    \n\
+				penetrate --root			    \n\
+				petri --root				    \n\
+				phosphor --root				    \n\
+  GL: 				pulsar --root				    \n\
+				ripples --root				    \n\
+				shadebobs --root			    \n\
+  GL: 				sierpinski3d --root			    \n\
+				spotlight --root			    \n\
+				squiral --root				    \n\
+				wander --root				    \n\
+				xflame --root				    \n\
+				xmatrix --root				    \n\
+  GL: 				gflux --root				    \n\
+				nerverot --root				    \n\
+				xrayswarm --root			    \n\
+				xspirograph --root			    \n\
+  GL: 				circuit --root				    \n\
+  GL: 				dangerball --root			    \n\
+- GL: 				dnalogo --root				    \n\
+  GL: 				engine --root				    \n\
+  GL: 				flipscreen3d --root			    \n\
+  GL: 				gltext --root				    \n\
+  GL: 				menger --root				    \n\
+  GL: 				molecule --root				    \n\
+				rotzoomer --root			    \n\
+				scooter --root				    \n\
+				speedmine --root			    \n\
+  GL: 				starwars --root				    \n\
+  GL: 				stonerview --root			    \n\
+				vermiculate --root			    \n\
+				whirlwindwarp --root			    \n\
+				zoom --root				    \n\
+				anemone --root				    \n\
+				apollonian --root			    \n\
+  GL: 				boxed --root				    \n\
+  GL: 				cubenetic --root			    \n\
+  GL: 				endgame --root				    \n\
+				euler2d --root				    \n\
+				fluidballs --root			    \n\
+  GL: 				flurry --root				    \n\
+  GL: 				glblur --root				    \n\
+  GL: 				glsnake --root				    \n\
+				halftone --root				    \n\
+  GL: 				juggler3d --root			    \n\
+  GL: 				lavalite --root				    \n\
+				polyominoes --root			    \n\
+  GL: 				queens --root				    \n\
+  GL: 				sballs --root				    \n\
+  GL: 				spheremonics --root			    \n\
+				twang --root				    \n\
+  GL: 				antspotlight --root			    \n\
+				apple2 --root				    \n\
+  GL: 				atunnel --root				    \n\
+				barcode --root				    \n\
+  GL: 				blinkbox --root				    \n\
+  GL: 				blocktube --root			    \n\
+  GL: 				bouncingcow --root			    \n\
+				cloudlife --root			    \n\
+  GL: 				cubestorm --root			    \n\
+				eruption --root				    \n\
+  GL: 				flipflop --root				    \n\
+  GL: 				flyingtoasters --root			    \n\
+				fontglide --root			    \n\
+  GL: 				gleidescope --root			    \n\
+  GL: 				glknots --root				    \n\
+  GL: 				glmatrix --root				    \n\
+- GL: 				glslideshow --root			    \n\
+  GL: 				hypertorus --root			    \n\
+  GL: 				jigglypuff --root			    \n\
+				metaballs --root			    \n\
+  GL: 				mirrorblob --root			    \n\
+				piecewise --root			    \n\
+  GL: 				polytopes --root			    \n\
+				pong --root				    \n\
+				popsquares --root			    \n\
+  GL: 				surfaces --root				    \n\
+				xanalogtv --root			    \n\
+				abstractile --root			    \n\
+				anemotaxis --root			    \n\
+  GL: 				antinspect --root			    \n\
+				fireworkx --root			    \n\
+				fuzzyflakes --root			    \n\
+				interaggregate --root			    \n\
+				intermomentary --root			    \n\
+				memscroller --root			    \n\
+  GL: 				noof --root				    \n\
+				pacman --root				    \n\
+  GL: 				pinion --root				    \n\
+  GL: 				polyhedra --root			    \n\
+  GL: 				providence --root			    \n\
+				substrate --root			    \n\
+				wormhole --root				    \n\
+  GL: 				antmaze --root				    \n\
+  GL: 				boing --root				    \n\
+				boxfit --root				    \n\
+  GL: 				carousel --root				    \n\
+				celtic --root				    \n\
+  GL: 				crackberg --root			    \n\
+  GL: 				cube21 --root				    \n\
+				fiberlamp --root			    \n\
+  GL: 				fliptext --root				    \n\
+  GL: 				glhanoi --root				    \n\
+  GL: 				tangram --root				    \n\
+  GL: 				timetunnel --root			    \n\
+  GL: 				glschool --root				    \n\
+  GL: 				topblock --root				    \n\
+  GL: 				cubicgrid --root			    \n\
+				cwaves --root				    \n\
+  GL: 				gears --root				    \n\
+  GL: 				glcells --root				    \n\
+  GL: 				lockward --root				    \n\
+				m6502 --root				    \n\
+  GL: 				moebiusgears --root			    \n\
+  GL: 				voronoi --root				    \n\
+  GL: 				hypnowheel --root			    \n\
+  GL: 				klein --root				    \n\
+				lcdscrub --root				    \n\
+  GL: 				photopile --root			    \n\
+  GL: 				skytentacles --root			    \n\
+  GL: 				rubikblocks --root			    \n\
+  GL: 				companioncube --root			    \n\
+  GL: 				hilbert --root				    \n\
+  GL: 				tronbit --root				    \n\
+  GL: 				geodesic --root				    \n\
+				hexadrop --root				    \n\
+  GL: 				kaleidocycle --root			    \n\
+  GL: 				quasicrystal --root			    \n\
+  GL: 				unknownpleasures --root			    \n\
+				binaryring --root			    \n\
+  GL: 				cityflow --root				    \n\
+  GL: 				geodesicgears --root			    \n\
+  GL: 				projectiveplane --root			    \n\
+  GL: 				romanboy --root				    \n\
+				tessellimage --root			    \n\
+  GL: 				winduprobot --root			    \n\
+  GL: 				splitflap --root			    \n\
+  GL: 				cubestack --root			    \n\
+  GL: 				cubetwist --root			    \n\
+  GL: 				discoball --root			    \n\
+  GL: 				dymaxionmap --root			    \n\
+  GL: 				energystream --root			    \n\
+  GL: 				hexstrut --root				    \n\
+  GL: 				hydrostat --root			    \n\
+  GL: 				raverhoop --root			    \n\
+  GL: 				splodesic --root			    \n\
+  GL: 				unicrud --root				    \n\
+  GL: 				esper --root				    \n\
+  GL: 				vigilance --root			    \n\
+  GL: 				crumbler --root				    \n\
+				filmleader --root			    \n\
+				glitchpeg --root			    \n\
+  GL: 				handsy --root				    \n\
+  GL: 				maze3d --root				    \n\
+  GL: 				peepers --root				    \n\
+  GL: 				razzledazzle --root			    \n\
+				vfeedback --root			    \n\
+  GL: 				deepstars --root			    \n\
+  GL: 				gravitywell --root			    \n\
+  GL: 				beats --root				    \n\
+  GL: 				covid19 --root				    \n\
+  GL: 				etruscanvenus --root			    \n\
+  GL: 				gibson --root				    \n\
+  GL: 				headroom --root				    \n\
+  GL: 				sphereeversion --root			    \n\
+				binaryhorizon --root			    \n\
+				marbling --root				    \n\
+  GL: 				chompytower --root			    \n\
+  GL: 				hextrail --root				    \n\
+  GL: 				mapscroller --root			    \n\
+  GL: 				nakagin --root				    \n\
+  GL: 				squirtorus --root			    \n\
+  GL: 				cubocteversion --root			    \n\
+				droste --root				    \n\
+  GL: 				papercube --root			    \n\
+  GL: 				skulloop --root				    \n\
+  GL: 				highvoltage --root			    \n\
+  GL: 				kallisti --root				    \n\
+
+
+pointerHysteresis:  10
+authWarningSlack:   20
+
diff --git a/setup/setupscr.sh b/setup/setupscr.sh
index 3386be7..860265d 100644
--- a/setup/setupscr.sh
+++ b/setup/setupscr.sh
@@ -11,9 +11,10 @@ wget -q --spider https://github.com
 if [ $? -eq 0 ]; then
     echo 'Internet connection found'
 else
-    echo 'Error you device seems to be off-line.'
+    echo 'Error, either your device is off-line or https://github.com is off-line.'
     exit
 fi
+
 #installation options
 echo "Please enter the username of the user it must be installed for."
 read -p "Username: " user
@@ -48,11 +49,33 @@ while true; do
     case $gitrep in
         y*|Y*)
             while true; do
-                read -p "Where do you wish to install the robosoccer repository? Default: /home/$user/Documents/" gitreploc
+                read -p "Where do you wish to install the robosoccer repository? (Default: /home/$user/Documents/)" gitreploc
                 case $gitreploc in
                     "")
                         echo 'Left empty, using default folder.'
-                        break
+                        gitreploc="/home/$user/Documents/"
+                        if [ -d "/home/$user/Documents/" ]; then
+                            break
+                        fi
+                        read -p "/home/$user/Documents/ does not exist or is an file, do you wish to create this folder?" inp3
+                        case $inp3 in
+                            y*|Y*)
+                                mkdir "$gitreploc"
+                                if [ -d "$gitreploc" ]; then
+                                    echo "Somthing went wrong with the creation of the directory, exiting"
+                                    exit
+                                fi
+                                break
+                                ;;
+                           n*|N*)
+                                echo "Will not clone git repository"
+                                gitrep=N
+                                break
+                                ;;
+                           *)
+                                echo "Did not recognize input please retry"
+                                ;;
+                        esac
                         ;;
                     *)
                         if [ -d "$gitreploc" ]; then
@@ -76,6 +99,7 @@ while true; do
                             *)
                                 echo "Did not recognize input please retry"
                                 ;;
+                        esac
                         ;;
                 esac
             done
@@ -91,10 +115,12 @@ while true; do
     esac
 done
 
-
-
 #setup DE
 apt install xfce4-goodies xfce4 lightdm xscreensaver xscreensaver-data xscreensaver-data-extra xscreensaver-gl xscreensaver-gl-extra xscreensaver-screensaver-bsod xscreensaver-screensaver-dizzy xscreensaver-screensaver-webcollage supertuxkart -y
+wget https://github.com/mendelcollege-robotics/robotica/blob/main/setup/xscreensaver.desktop -O /etc/xdg/autostart/xscreensaver.desktop
+apt remove gnome-screensaver
+wget https://github.com/mendelcollege-robotics/robotica/blob/main/setup/.xscreensaver -O "/home/$user/.xscreensaver"
+
 
 #install arduino ide
 apt install arduino usbutils unzip wget -y
@@ -107,18 +133,22 @@ wget https://github.com/mendelcollege-robotics/robotica/blob/main/setup/arduino2
 apt install usbutils -y
 wget https://github.com/openmv/openmv-ide/releases/download/development/openmv-ide-linux-x86_64-4.6.1.tar.gz -O /tmp/openmv.tar.gz
 tar -xzf /tmp/openmv.tar.gz --directory /tmp/
-su sh /tmp/openmv-ide/setup.sh
+sh /tmp/openmv-ide/setup.sh
 rm /tmp/openmv.tar.gz
 rm -rf /tmp/openmv-ide/
 
 #setup GIT
 apt install git -y
+    #secure download method
+gpg --import ./secrets/public.key
+gpg --import ./secrets/private.key
+mkdir -p "/home/$user/.ssh/"
+cp ./secrets/ssh-robosoccer "/home/$user/.ssh/ssh-robosoccer"
+cp ./secrets/ssh-robosoccer.pub "/home/$user/.ssh/ssh-robosoccer.pub"
+sudo -u $user "git config --global user.signingkey 08242B7544C76B9E9B4EFB91C6C9DC589850AB7D"
+wget https://github.com/mendelcollege-robotics/robotica/blob/main/setup/.gitmessage.txt -O /home/$user/.gitmessage.txt
+sudo -u $user  "git config --global commit.template ~/.gitmessage.txt"
 
 #download git repo
+sudo -u $user "git clone git@github.com:mendelcollege-robotics/robotica.git $gitreploc"
 
-
-stty -echo
-printf 'Password: '
-read PASSWORD
-stty echo
-printf '\n'
diff --git a/setup/xscreensaver.desktop b/setup/xscreensaver.desktop
new file mode 100644
index 0000000..b8f0be4
--- /dev/null
+++ b/setup/xscreensaver.desktop
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Name=Screensaver
+Type=Application
+Exec=xscreensaver -nosplash