From 33e88a798b2eae21cf2e923f5df9c2e8388363a3 Mon Sep 17 00:00:00 2001 From: Elian Van Cutsem Date: Sat, 25 Jan 2020 16:02:03 +0100 Subject: [PATCH 1/6] style changes --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 850bd98..661bd4a 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,7 @@ Usage: `sudo ./install.sh` **[OPTIONS...]** | -h, --help | Show this help | For example: + 1. `Install Tela theme on 2k display device` sudo ./install.sh -t -2 @@ -37,7 +38,9 @@ For example: sudo ./install.sh -r -t ## Display resolution issues + #### Set the right resolution of your display + On the grub screen, `press c` to get the commandline, and enter `vbeinfo` or `videoinfo` on EFI boot to check what resolutions you can use, then edit `/etc/default/grub` , add your resolution `GRUB_GFXMODE=****x****x32` into it, From 2f1d1ea6731cdd24381f011df5d8867080289aa7 Mon Sep 17 00:00:00 2001 From: Elian Van Cutsem Date: Sat, 25 Jan 2020 16:13:33 +0100 Subject: [PATCH 2/6] style-rule changes on README.md --- README.md | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 850bd98..703912d 100644 --- a/README.md +++ b/README.md @@ -11,11 +11,11 @@ ## Install -Usage: `sudo ./install.sh` **[OPTIONS...]** +Usage: `sudo ./install.sh [OPTIONS...]` -*if no option used the terminal user interface will be show up* +_if no option used the terminal user interface will be show up_ -| OPTIONS: | | +| OPTIONS: | description | |:---------------|:-------------| | -v, --vimix | Vimix grub theme | | -s, --stylish | Stylish grub theme | @@ -28,35 +28,37 @@ Usage: `sudo ./install.sh` **[OPTIONS...]** | -h, --help | Show this help | For example: -1. `Install Tela theme on 2k display device` - sudo ./install.sh -t -2 +1. Install Tela theme on 2k display device -2. `Remove Tela theme` + `sudo ./install.sh -t -2` + or + `sudo ./install.sh --tela --2k` - sudo ./install.sh -r -t +2. Remove Tela theme + + `sudo ./install.sh -r -t` ## Display resolution issues + #### Set the right resolution of your display -On the grub screen, `press c` to get the commandline, -and enter `vbeinfo` or `videoinfo` on EFI boot to check what resolutions you can use, -then edit `/etc/default/grub` , add your resolution `GRUB_GFXMODE=****x****x32` into it, -last you can run `grub-mkconfig -o /boot/grub/grub.cfg` to update your grub.cfg. + +On the grub screen, `press c` to get the commandline, and enter `vbeinfo` or `videoinfo` on EFI boot to check what resolutions you can use, then edit `/etc/default/grub` , add your resolution `GRUB_GFXMODE=****x****x32` into it, last you can run `grub-mkconfig -o /boot/grub/grub.cfg` to update your grub.cfg. ## Screenshots ### Vimix grub theme -![01](https://github.com/vinceliuice/grub2-themes/blob/master/screenshots/grub-theme-vimix.jpg?raw=true) +![vimix grub theme](https://github.com/vinceliuice/grub2-themes/blob/master/screenshots/grub-theme-vimix.jpg?raw=true) ### Stylish grub theme -![02](https://github.com/vinceliuice/grub2-themes/blob/master/screenshots/grub-theme-stylish.jpg?raw=true) +![Stylish grub theme](https://github.com/vinceliuice/grub2-themes/blob/master/screenshots/grub-theme-stylish.jpg?raw=true) ### Tela grub theme -![03](https://github.com/vinceliuice/grub2-themes/blob/master/screenshots/grub-theme-tela.jpg?raw=true) +![Tela](https://github.com/vinceliuice/grub2-themes/blob/master/screenshots/grub-theme-tela.jpg?raw=true) ### Slaze grub theme -![04](https://github.com/vinceliuice/grub2-themes/blob/master/screenshots/grub-theme-slaze.jpg?raw=true) +![Slaze](https://github.com/vinceliuice/grub2-themes/blob/master/screenshots/grub-theme-slaze.jpg?raw=true) From cd489716ba4d02e985f70feaaf08b12786ba4d18 Mon Sep 17 00:00:00 2001 From: Elian Van Cutsem Date: Sat, 25 Jan 2020 16:21:07 +0100 Subject: [PATCH 3/6] added FreeBSD logo --- assets/assets-color/icons-1080p/freebsd.png | Bin 0 -> 1131 bytes assets/assets-color/icons-2k/freebsd.png | Bin 0 -> 1708 bytes assets/assets-color/icons-4k/freebsd.png | Bin 0 -> 2353 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 assets/assets-color/icons-1080p/freebsd.png create mode 100644 assets/assets-color/icons-2k/freebsd.png create mode 100644 assets/assets-color/icons-4k/freebsd.png diff --git a/assets/assets-color/icons-1080p/freebsd.png b/assets/assets-color/icons-1080p/freebsd.png new file mode 100644 index 0000000000000000000000000000000000000000..d51cfe3a596ea3204191729980e0efdf9d9654f1 GIT binary patch literal 1131 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!ItFh?gFHN;HUHMdLYGF z;1OBOz`%DHgc*(L$Ip(4jW zp1*Z2L;P!gxQfW+H%J!)6I{;+G#O%xwA$u|sE+oY>(jpeeZAOh(QM6=dr!{Yp(xob$Pw~_hcB^wgJDGY zrR{4&ViU7IxfI2looPR|*f`An?emm3|AP)6Jhb^n_(zd6_3(LtQPOECwrA=nXv4tB)Nt;S-*$sXKp#tNP`OMl5U@HM4>zulyl>*tGA%k)CPw(z72< zQ*8Qvb%ourWm9;R3(v9|T?l{dUF13M*%hf%JtDoUx9sv@TO}mZeeBr|39A^TzrD=O z^IqNAvfbxemCXGZmLHuDP8ZE>ZaOPfdY3i$gZGA|Ch`0D%HkgITq_07CrFKl_wDYi9r?`IX}3zM#~ z>n|?uc+lST{Qb#a>*j5n%yTB_z23{O2_Ju&3Ci%z%l4K3miIsY>h6&1oj>(%YW-=w zZF>5v_dH{q^g*+ty2>@77f)&U|?1RcrFWSBDOLTa$0!y0h`B;MUbz zavpO2%M!k1wxtwE%xBLRy|yj&?|jBh#c8iPZi$MPCxjXC3LC0r^6oNOP`&8m>g{zA zx6E#@JZSriKj^Gf&jqPuV4h}BEpd$~Nl7e8wMs5Z1yT$~21W+D28OyurXhv~R)!W< qMkcxjrd9?9xeK0FplHa=PsvQH#H~T*Z|o7E1_n=8KbLh*2~7Yz(EQr~ literal 0 HcmV?d00001 diff --git a/assets/assets-color/icons-2k/freebsd.png b/assets/assets-color/icons-2k/freebsd.png new file mode 100644 index 0000000000000000000000000000000000000000..8493984596ba9e3caf52a18527223eb9a311defa GIT binary patch literal 1708 zcmV;d22=ToP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006 zVoOIv00000008+zyMF)x010qNS#tmY4#NNd4#NS*Z>VGd000McNliru1Cju6Txy(AR$zY6{V?4BsSJyXQp1zClh_3 zQ9+Hw3nm61)TA_3lj;jdO}quEN!11el1kg56>JPdu>~x)i2|)w+fu0UluoC&v;RJv zJvyy3bk4M$Lw_$PXRo#X>-$^#oVEXJt<5>ESQqtACtoeOJZJ>lFc7TiN?R9d9Bnt~ z!+NGQMYqWAE>UYzmg#Vfp*J}^bh#sK#oM4h^>~<*+<^JG0xuM-h_z9Fw&bdl+LXbb z;E`ZeEp6)67#ypE0rh$ru1@CS8eEyo!i=CRDKQxQ3xCJ9;HgO4`Ze~wLfn~USde@) zS&&?c+HiTn_IN1jgUNYg-XacGMt)eNNBT4l!bUw^$0M#Oxe@)zoa8m*zV#f$b5-nL zMS7yY8l(aB8D&_Md@7kg7GH2Q9*X)ulh>W9!-AIzKHr^I4~4gv+>(5-8kN&haIoOs zBHfYUEhV=l3zP0swAdS>~TgK3Q^ioA83?v9_pXJ{PUKaB>Ha7Tj9WSMuHQ{7>3Za^7xnVX`=x z*>3yb!CKl;^g7TCRt5V<6mBi}Lb9;r8%fWZgs%)-m(-KP6M)|vtm@S$3nzXBxiJwHf9GnnD_lFud6Cdq*0qLL*A>kC$*IR^a8 z1$UQxwi&J))j)<1R|(mqDw*A6S@3YJ_4(o`2JXSZDur1*pr`8u1MBtlBp)*(+na0? zCEv!r8aEZ(8$4gliVqZgtL4Mg=O)R#5~OF1pEjSmzI2|)}2_mUVVDN zdOh9EhzFB}oi=c?s&&JDt>?x?Bd+f(Skwg>afwNo_a~w%6BsQUxHx%pQB}GOukAE! zo5rSNP65$cRZZ_SRGSK1SwP8!*`ew4G&O5@8a=<$Bok3Gqd5IAoz<{`L!Abhh=ReQ zaYr=i-^zTnRVOy^MW zc&CZlQSeM;{;hxo8iLFO0D!eKjdq zTcp37V4y0vKiJx7z*E5Q5ANyHIB8!9i?XphSP`^+tTc%ReqLn$Vfg$1rt47tn(9%WO`0L2)qh_O*W^+ry*Mdf;!7CjP?kdtR zPc9hMz_kwQ%3K{Rjm~GPWx-DhmiK8KJGpSoRoF^La&zoN+(lbfoO_%jWDC|FalygwV8$JwSmZPZgc9&vryIz@lqnJ`kl4e-0_ zZGd%s8snZg+BPt(4eC>xVQ$HXs*Tn+CiU^g3IFsLv|H zTa)YYwq&-}KIY71O0*KhLA(^~z|+Cw!Ity0+%@0JInloV1NZaoiZhzgHUIzsC3Hnt zbYx+4WjbSWWnpw>05UK#FfA}KEiyG!F)%tYI65*kEig4YFfeVP<#+%903~!qSaf7z zbY(hiZ)9m^c>ppnGB7PLF)cDRR536*F*rIhG%YYSIxsLC{awTW0000 CNg(?G literal 0 HcmV?d00001 diff --git a/assets/assets-color/icons-4k/freebsd.png b/assets/assets-color/icons-4k/freebsd.png new file mode 100644 index 0000000000000000000000000000000000000000..c2e9ced9f7b5aa77f7e7822bd5d626e6e200e29d GIT binary patch literal 2353 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 Q9)$rQ?f3Pp^Pn^T3&qnj%m4rY literal 0 HcmV?d00001 From 7c7fe3f33c5877240f86b7fd63bb5b5cc2374690 Mon Sep 17 00:00:00 2001 From: Elian Van Cutsem Date: Sat, 25 Jan 2020 16:48:59 +0100 Subject: [PATCH 4/6] style changes --- README.md | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 0602779..af304eb 100644 --- a/README.md +++ b/README.md @@ -28,11 +28,6 @@ _if no option used the terminal user interface will be show up_ | -h, --help | Show this help | For example: -<<<<<<< HEAD -======= - -1. `Install Tela theme on 2k display device` ->>>>>>> 33e88a798b2eae21cf2e923f5df9c2e8388363a3 1. Install Tela theme on 2k display device @@ -48,14 +43,7 @@ For example: #### Set the right resolution of your display -<<<<<<< HEAD On the grub screen, `press c` to get the commandline, and enter `vbeinfo` or `videoinfo` on EFI boot to check what resolutions you can use, then edit `/etc/default/grub` , add your resolution `GRUB_GFXMODE=****x****x32` into it, last you can run `grub-mkconfig -o /boot/grub/grub.cfg` to update your grub.cfg. -======= -On the grub screen, `press c` to get the commandline, -and enter `vbeinfo` or `videoinfo` on EFI boot to check what resolutions you can use, -then edit `/etc/default/grub` , add your resolution `GRUB_GFXMODE=****x****x32` into it, -last you can run `grub-mkconfig -o /boot/grub/grub.cfg` to update your grub.cfg. ->>>>>>> 33e88a798b2eae21cf2e923f5df9c2e8388363a3 ## Screenshots @@ -69,8 +57,8 @@ last you can run `grub-mkconfig -o /boot/grub/grub.cfg` to update your grub.cfg. ### Tela grub theme -![Tela](https://github.com/vinceliuice/grub2-themes/blob/master/screenshots/grub-theme-tela.jpg?raw=true) +![Tela grub theme](https://github.com/vinceliuice/grub2-themes/blob/master/screenshots/grub-theme-tela.jpg?raw=true) ### Slaze grub theme -![Slaze](https://github.com/vinceliuice/grub2-themes/blob/master/screenshots/grub-theme-slaze.jpg?raw=true) +![Slaze grub theme](https://github.com/vinceliuice/grub2-themes/blob/master/screenshots/grub-theme-slaze.jpg?raw=true) From 650a723cb369e939b81e2c08b339c77b38056641 Mon Sep 17 00:00:00 2001 From: Elian Van Cutsem Date: Sat, 25 Jan 2020 16:49:57 +0100 Subject: [PATCH 5/6] test --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index af304eb..2705dfe 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ On the grub screen, `press c` to get the commandline, and enter `vbeinfo` or `vi ### Vimix grub theme -![vimix grub theme](https://github.com/vinceliuice/grub2-themes/blob/master/screenshots/grub-theme-vimix.jpg?raw=true) +![vimix grub theme](https://github.com/vinceliuice/grub2-themes/blob/master/screenshots/grub-theme-vimix.jpg?raw=true "vimix grub theme") ### Stylish grub theme From 6f92a8c04e8ee32e2307e379a67848649ce0d623 Mon Sep 17 00:00:00 2001 From: Elian Van Cutsem Date: Sat, 25 Jan 2020 17:24:33 +0100 Subject: [PATCH 6/6] added operation canceled script --- install.sh | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/install.sh b/install.sh index 644f364..04504b7 100755 --- a/install.sh +++ b/install.sh @@ -154,8 +154,7 @@ install() { sudo -S <<< $REPLY $0 --${theme} --${screen} fi } || { - prompt "\n Operation canceled Bye" - exit 1 + operation_canceled } fi } @@ -173,7 +172,7 @@ run_dialog() { 2) theme="tela" ;; 3) theme="stylish" ;; 4) theme="slaze" ;; - *) prompt "Canceled" ;; + *) operation_canceled ;; esac tui=$(dialog --backtitle "GRUB2 THEMES" \ --radiolist "Choose icon style : " 15 40 5 \ @@ -182,7 +181,7 @@ run_dialog() { case "$tui" in 1) icon="white" ;; 2) icon="color" ;; - *) prompt "Canceled" ;; + *) operation_canceled ;; esac tui=$(dialog --backtitle "GRUB2 THEMES" \ --radiolist "Choose your Display Resolution : " 15 40 5 \ @@ -193,11 +192,17 @@ run_dialog() { 1) screen="1080p" ;; 2) screen="2k" ;; 3) screen="4k" ;; - *) prompt "Canceled" ;; + *) operation_canceled ;; esac fi } +operation_canceled() { + clear + prompt "\n Operation canceled by user Bye" + exit 1 +} + install_dialog() { if [ ! "$(which dialog 2> /dev/null)" ]; then prompt -i "\n 'dialog' needs to be installed for this shell" @@ -272,8 +277,7 @@ remove() { sudo -S <<< $REPLY $0 --remove --${theme} fi } || { - prompt "\n Operation canceled Bye" - exit 1 + operation_canceled } fi } @@ -292,8 +296,7 @@ if [[ $# -lt 1 ]] && [[ $UID -ne $ROOT_UID ]]; then [[ -n "$REPLY" ]]&& { exec sudo -S <<< $REPLY $0 }|| { - prompt "\n Operation canceled Bye" - exit 1 + operation_canceled } fi