diff --git a/nanodesk-files/usr/bin/nanodesk-installer-gxm b/nanodesk-files/usr/bin/nanodesk-installer-gxm index 5c129a8..d2433d2 100755 --- a/nanodesk-files/usr/bin/nanodesk-installer-gxm +++ b/nanodesk-files/usr/bin/nanodesk-installer-gxm @@ -2,10 +2,13 @@ TITLE="nanodesk-installer-gxm" VERSION=$(cat /usr/share/nanodesk/version) +HEADER=" ----==== nanodesk-installer-gxm ====---- +nanodesk ${VERSION} +" GXMCMD="gxmessage -name $TITLE -center -geometry 669x420 -wrap -font mono,10 -file -" -GXMINFO="gxmessage -name $TITLE -center -buttons Close -default Close -font mono,16 -file -" +GXMINFO="gxmessage -name $TITLE -center -buttons Close -default Close -font mono,13 -file -" DOCROOT="/usr/share/doc/nanodesk-installer" DILLOCMD="dillo -f -g 640x480 $DOCROOT" @@ -52,33 +55,35 @@ Delete $ERRORFILE ?" | $GXMINFO -buttons "Yes:0,No:1" -default Yes } gxm-welcome() { - echo " ----==== nanodesk-installer-gxm ====---- -nanodesk ${VERSION} - + echo "$HEADER This is a gxmessage based Installation assistant for nanodesk. To install nanodesk you need a partitioned and formated drive. -You can do the partioning and formating with 'GParted'. +You can do the partioning and formating with 'GParted'. (Close 'GParted' +when you are done) If you need help how to do so, click on 'Help'. When you are done partitioning and your installation target is formated, go ahead with 'Install'. -When asked for a password, type in 'debian'" | +When asked for a password, type in 'debian', which is the nanodesk live +default." | $GXMCMD -buttons "Abort:1,Help:2,GParted:10,Install:0" return $? } gxm-select-target() { - echo "Please enter the target and press 'Install'. + echo "$HEADER +Please enter the target and press 'Install'. For example: /dev/sda1" | $GXMCMD -entry -buttons "Abort:1,Help:2,Install:0" return $? } gmx-start-cli-installer() { - echo "The commandline nanodesk-installer will now open in a new xterm + echo "$HEADER +The commandline nanodesk-installer will now open in a new xterm window. Target device: $1 @@ -89,9 +94,7 @@ Please follow the instructions there and see you later again..." | } gxm-success() { - echo " ----==== nanodesk-installer-gxm ====---- -nanodesk ${VERSION} - + echo "$HEADER Installation complete! :) You can now reboot or continue using nanodesk live." | $GXMCMD -buttons Continue:0,Reboot:2 -default Continue @@ -99,9 +102,7 @@ You can now reboot or continue using nanodesk live." | $GXMCMD -buttons Continue } gxm-error() { - echo " ----==== nanodesk-installer-gxm ====---- -nanodesk ${VERSION} - + echo "$HEADER Installation FAILED!! :( Last message was: $(cat $ERRORFILE)" | $GXMCMD -buttons Close -default Close @@ -117,12 +118,71 @@ Last message was: $(cat $ERRORFILE)" | $GXMCMD -buttons Close -default Close help-gparted() { - echo "help-gparted" | $GXMCMD + cat <> $ERRORFILE" - #xterm -e /bin/bash -c "pkexec mc || echo 'pkexec auth failed' >> $ERRORFILE" - #xterm -e /bin/bash -c "pkexec mc || echo 'pkexec auth failed' >> $ERRORFILE" - #xterm -e /bin/bash -c "pkexec 'false ' ; echo $? ; echo 'Please press enter to continue...' ; read" } @@ -226,7 +283,7 @@ then RETURN=$? case $RETURN in - 2) echo reboot ;; + 2) systemctl reboot ;; *) exit 0 ;; esac elif [ -f "$ERRORFILE" ] diff --git a/nanodesk-files/usr/share/doc/nanodesk/welcome/welcome.md b/nanodesk-files/usr/share/doc/nanodesk/welcome/welcome.md index a8a91df..4f6bc48 100644 --- a/nanodesk-files/usr/share/doc/nanodesk/welcome/welcome.md +++ b/nanodesk-files/usr/share/doc/nanodesk/welcome/welcome.md @@ -5,21 +5,24 @@ that comes with the `jwm` window manager. This is just a fun project for learning purposes. -## install to disk +Visit the git repository at +(git.la10cy.net/DeltaLima/nanodesk)[https://git.la10cy.net/DeltaLima/nanodesk] + +## install to disk: nanodesk-installer You can install nanodesk to your harddrive. Before doing so, you have to get your drive partitioned and formated. -Partitioning on an empty drive is simple, you need two partitions +Under `Menu -> System -> nanodesk-installer` you find the GUI +of the nanodesk-installer. It will guide you through the first basic +partitioning steps and formating your drive with `GParted`. +The installation process itself is done by the `nanodesk-installer` cli. -- partition1: ext4, main filesystem. -- partition2: swap, optional but recommended. About 20%-50% the size of your RAM. +You can also just run the cli directly running +`sudo nanodesk-installer [TARGET]` -You can use `Menu -> System -> GParted` or `fdisk` on the shell for this. -Please read their manuals. - -This done, just run `sudo nanodesk-installer /dev/sdXY` from the terminal -and the installation will start. (change /dev/sdXY to your drive) +Keep in Mind, that `[TARGET]` needs to be a (ext4) preformated +blockdevice and should be a partition. ## installing software