Merge pull request #98 from Dragon8oy/master

Compress .svg, modify 4MLinux and android icons, fix grub transparency issue

README.md

@@ -7,64 +7,78 @@
 
 ```
 
-## Flat Design themes for Grub2.
+## Flat Design themes for Grub
 
-## Install
+## Installation:
 
 Usage:  `sudo ./install.sh [OPTIONS...]`
 
-_if no option used the terminal user interface will be show up_
+|  Options:              | Description: |
+|:-----------------------|:-------------|
+| -b, --boot             | Install grub theme into `/boot/grub/themes` |
+| -v, --vimix            | Install Vimix grub theme |
+| -s, --stylish          | Install Stylish grub theme |
+| -t, --tela             | Install Tela grub theme |
+| -l, --slaze            | Install Slaze grub theme |
+| -w, --white            | Install using black and white icons |
+| -u, --ultrawide        | Install 21:9 (2560x1080) background image - not available for slaze theme|
+| -C, --custom-background| Use either background.jpg or custom-background.jpg as theme background instead
+| -2, --2k               | Install 2k (2560x1440) background image |
+| -4, --4k               | Install 4k (3840x2160) background image |
+| -r, --remove [THEME]   | Uninstall selected theme |
+| -h, --help             | Show this help |
 
-|  OPTIONS:          | description |
-|:-------------------|:-------------|
-| -b, --boot         | Install grub theme into /boot/grub/themes |
-| -v, --vimix        | Vimix grub theme |
-| -s, --stylish      | Stylish grub theme |
-| -t, --tela         | Tela grub theme |
-| -l, --slaze        | Slaze grub theme |
-| -w, --white        | Install white color icon version |
-| -u, --ultrawide    | Install 2560x1080 background image - not available for slaze theme|
-| -2, --2k           | Install 2k(2560x1440) background image |
-| -4, --4k           | Install 4k(3840x2160) background image |
-| -r, --remove       | Remove theme (must add theme name option) |
-| -h, --help         | Show this help |
+_If no options are used, a user interface will show up instead_
 
-For example:
+### Examples:
+ - Install Tela theme on 2k display device:
+   - `sudo ./install.sh --tela --2k`
 
-1. Install Tela theme on 2k display device
+ - Install Tela theme into /boot/grub/themes:
+   - `sudo ./install.sh -b -t`
 
-    `sudo ./install.sh -t -2`
-    or
-    `sudo ./install.sh --tela --2k`
+ - Uninstall Tela theme:
+   - `sudo ./install.sh -r -t`
 
-2. Install Tela theme into /boot/grub/themes
+## Issues / tweaks:
 
-    `sudo ./install.sh -b -t`
+### Correcting display resolution:
 
-3. Remove Tela theme
+ - On the grub screen, press `c` to enter the command line
+ - Enter `vbeinfo` or `videoinfo` to check available resolutions
+ - Open `/etc/default/grub`, and edit `GRUB_GFXMODE=[height]x[width]x32` to match your resolution
+ - Finally, run `grub-mkconfig -o /boot/grub/grub.cfg` to update your grub config
 
-    `sudo ./install.sh -r -t`
+### Setting a custom background:
 
-## Display resolution issues
+ - Make sure you have `imagemagick` installed, or at least something that provides `convert`
+ - Find the resolution of your display, and make sure your background matches the resolution
+   - (1920x1080 -> --1080p, 2560x1080 -> --ultrawide, 2560x1440 -> --2k, 3840x2160 -> --4k)
+ - Place your custom background inside the root of the project, and name it either background.jpg or custom-background.jpg
+ - Run the installer like normal, but with `--custom-background`, `--[YOUR_RESOLUTION]` and `--[THEME]`
+   - Make sure to replace `[YOUR_RESOLUTION]` with your resolution and `[THEME]` with the theme
 
-#### Set the right resolution of your display
+## Contributing:
+ - If you made changes to icons, or added a new one:
+   - Delete the existing icon, if there is one
+   - Run `cd assets; ./render-all.sh`
+ - Create a pull request from your branch or fork
+ - If any issues occur, report then to the [issue](https://github.com/vinceliuice/grub2-themes/issues) page
 
-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:
 
-## Screenshots
+### Vimix grub theme:
 
-### Vimix grub theme
+![Vimix](screenshots/grub-theme-vimix.jpg?raw=true)
 
-![vimix grub theme](screenshots/grub-theme-vimix.jpg?raw=true)
+### Stylish grub theme:
 
-### Stylish grub theme
+![Stylish](screenshots/grub-theme-stylish.jpg?raw=true)
 
-![Stylish grub theme](screenshots/grub-theme-stylish.jpg?raw=true)
+### Tela grub theme:
 
-### Tela grub theme
+![Tela](screenshots/grub-theme-tela.jpg?raw=true)
 
-![Tela grub theme](screenshots/grub-theme-tela.jpg?raw=true)
+### Slaze grub theme:
 
-### Slaze grub theme
-
-![Slaze grub theme](screenshots/grub-theme-slaze.jpg?raw=true)
+![Slaze](screenshots/grub-theme-slaze.jpg?raw=true)

assets/assets-color/logos.txt

@@ -1,52 +0,0 @@
-antergos
-arcolinux
-elementary
-korora
-mageia
-steamos
-archlinux
-fedora
-freebsd
-kubuntu
-manjaro
-ubuntu
-chakra
-gentoo
-opensuse
-windows
-debian
-parrot
-gnu-linux
-linuxmint
-siduction
-xubuntu
-deepin
-kali
-lubuntu
-solus
-kaos
-void
-macosx
-haiku
-endeavouros
-recovery
-restart
-shutdown
-cancel
-driver
-edit
-efi
-find.efi
-find.none
-help
-kbd
-lang
-type
-tz
-unset
-
-
-
-
-
-

assets/assets-color/render-logos-1080p.sh

@@ -1,35 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="/usr/bin/inkscape"
-OPTIPNG="/usr/bin/optipng"
-
-INDEX="logos.txt"
-ASSETS_DIR="icons-1080p"
-SRC_FILE="logos.svg"
-
-install -d $ASSETS_DIR
-
-for i in `cat $INDEX`
-do
-if [ -f $ASSETS_DIR/$i.png ]; then
-  echo $ASSETS_DIR/$i.png exists.
-else
-  echo
-  echo Rendering $ASSETS_DIR/$i.png
-  $INKSCAPE --export-id=$i \
-            --export-id-only \
-            --export-filename=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null
-  $OPTIPNG -o7 --quiet $ASSETS_DIR/$1.png
-fi
-done
-
-cd $ASSETS_DIR
-cp -a archlinux.png arch.png
-cp -a gnu-linux.png linux.png
-cp -a gnu-linux.png unknown.png
-cp -a gnu-linux.png lfs.png
-cp -a manjaro.png Manjaro.i686.png
-cp -a manjaro.png Manjaro.x86_64.png
-cp -a driver.png memtest.png
-
-exit 0

assets/assets-color/render-logos-2k.sh

@@ -1,36 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="/usr/bin/inkscape"
-OPTIPNG="/usr/bin/optipng"
-
-INDEX="logos.txt"
-ASSETS_DIR="icons-2k"
-SRC_FILE="logos.svg"
-
-install -d $ASSETS_DIR
-
-for i in `cat $INDEX`
-do
-if [ -f $ASSETS_DIR/$i.png ]; then
-  echo $ASSETS_DIR/$i.png exists.
-else
-  echo
-  echo Rendering $ASSETS_DIR/$i.png
-  $INKSCAPE --export-id=$i \
-            --export-dpi=144 \
-            --export-id-only \
-            --export-filename=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null
-  $OPTIPNG -o7 --quiet $ASSETS_DIR/$1.png
-fi
-done
-
-cd $ASSETS_DIR
-cp -a archlinux.png arch.png
-cp -a gnu-linux.png linux.png
-cp -a gnu-linux.png unknown.png
-cp -a gnu-linux.png lfs.png
-cp -a manjaro.png Manjaro.i686.png
-cp -a manjaro.png Manjaro.x86_64.png
-cp -a driver.png memtest.png
-
-exit 0

assets/assets-color/render-logos-4k.sh

@@ -1,36 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="/usr/bin/inkscape"
-OPTIPNG="/usr/bin/optipng"
-
-INDEX="logos.txt"
-ASSETS_DIR="icons-4k"
-SRC_FILE="logos.svg"
-
-install -d $ASSETS_DIR
-
-for i in `cat $INDEX`
-do
-if [ -f $ASSETS_DIR/$i.png ]; then
-  echo $ASSETS_DIR/$i.png exists.
-else
-  echo
-  echo Rendering $ASSETS_DIR/$i.png
-  $INKSCAPE --export-id=$i \
-            --export-dpi=192 \
-            --export-id-only \
-            --export-filename=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null
-  $OPTIPNG -o7 --quiet $ASSETS_DIR/$1.png
-fi
-done
-
-cd $ASSETS_DIR
-cp -a archlinux.png arch.png
-cp -a gnu-linux.png linux.png
-cp -a gnu-linux.png unknown.png
-cp -a gnu-linux.png lfs.png
-cp -a manjaro.png Manjaro.i686.png
-cp -a manjaro.png Manjaro.x86_64.png
-cp -a driver.png memtest.png
-
-exit 0

assets/assets-color/render-select-1080p.sh

@@ -1,26 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="/usr/bin/inkscape"
-OPTIPNG="/usr/bin/optipng"
-
-INDEX="select.txt"
-ASSETS_DIR="select-1080p"
-SRC_FILE="select.svg"
-
-install -d $ASSETS_DIR
-
-for i in `cat $INDEX`
-do
-if [ -f $ASSETS_DIR/$i.png ]; then
-  echo $ASSETS_DIR/$i.png exists.
-else
-  echo
-  echo Rendering $ASSETS_DIR/$i.png
-  $INKSCAPE --export-id=$i \
-            --export-id-only \
-            --export-filename=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null
-  $OPTIPNG -o7 --quiet $ASSETS_DIR/$1.png
-fi
-done
-
-exit 0

assets/assets-color/render-select-2k.sh

@@ -1,27 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="/usr/bin/inkscape"
-OPTIPNG="/usr/bin/optipng"
-
-INDEX="select.txt"
-ASSETS_DIR="select-2k"
-SRC_FILE="select.svg"
-
-install -d $ASSETS_DIR
-
-for i in `cat $INDEX`
-do
-if [ -f $ASSETS_DIR/$i.png ]; then
-  echo $ASSETS_DIR/$i.png exists.
-else
-  echo
-  echo Rendering $ASSETS_DIR/$i.png
-  $INKSCAPE --export-id=$i \
-            --export-dpi=144 \
-            --export-id-only \
-            --export-filename=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null
-  $OPTIPNG -o7 --quiet $ASSETS_DIR/$1.png
-fi
-done
-
-exit 0

assets/assets-color/render-select-4k.sh

@@ -1,27 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="/usr/bin/inkscape"
-OPTIPNG="/usr/bin/optipng"
-
-INDEX="select.txt"
-ASSETS_DIR="select-4k"
-SRC_FILE="select.svg"
-
-install -d $ASSETS_DIR
-
-for i in `cat $INDEX`
-do
-if [ -f $ASSETS_DIR/$i.png ]; then
-  echo $ASSETS_DIR/$i.png exists.
-else
-  echo
-  echo Rendering $ASSETS_DIR/$i.png
-  $INKSCAPE --export-id=$i \
-            --export-dpi=192 \
-            --export-id-only \
-            --export-filename=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null
-  $OPTIPNG -o7 --quiet $ASSETS_DIR/$1.png
-fi
-done
-
-exit 0

assets/assets-color/select.svg

@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="36"
-   height="36"
-   viewBox="0 0 9.5249997 9.5250002"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="select.svg">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#b7b7b7"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.919596"
-     inkscape:cx="16.187532"
-     inkscape:cy="24.609314"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     units="px"
-     inkscape:window-width="1366"
-     inkscape:window-height="714"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid28" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-287.47498)">
-    <rect
-       style="opacity:0.15;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.52916658;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-       id="select_c"
-       width="2.1166654"
-       height="9.5249996"
-       x="3.96875"
-       y="287.47498"
-       ry="0.016929913" />
-    <path
-       style="opacity:0.15;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.52916658;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-       d="m 3.9527305,287.47604 c -0.7253518,0.009 -1.3068969,0.59441 -1.3068969,1.32188 v 6.87917 c 0,0.72747 0.5815451,1.31324 1.3068969,1.32188 0.00858,-8.4e-4 0.01602,-0.007 0.01602,-0.016 v -9.49089 c 0,-0.009 -0.00744,-0.0152 -0.01602,-0.016 z"
-       id="select_w"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:0.15;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.52916658;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
-       d="m 6.1014366,287.47604 c -0.00858,8.4e-4 -0.01602,0.007 -0.01602,0.016 v 9.49089 c 0,0.009 0.00744,0.0152 0.01602,0.016 0.7253517,-0.009 1.3068967,-0.59441 1.3068967,-1.32188 v -6.87917 c 0,-0.72747 -0.581545,-1.31324 -1.3068967,-1.32188 z"
-       id="select_e"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

assets/assets-color/select.txt

@@ -1,3 +0,0 @@
-select_w
-select_c
-select_e

assets/assets-white/render-logos-1080p.sh

@@ -1,35 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="/usr/bin/inkscape"
-OPTIPNG="/usr/bin/optipng"
-
-INDEX="logos.txt"
-ASSETS_DIR="icons-1080p"
-SRC_FILE="logos.svg"
-
-install -d $ASSETS_DIR
-
-for i in `cat $INDEX`
-do
-if [ -f $ASSETS_DIR/$i.png ]; then
-  echo $ASSETS_DIR/$i.png exists.
-else
-  echo
-  echo Rendering $ASSETS_DIR/$i.png
-  $INKSCAPE --export-id=$i \
-            --export-id-only \
-            --export-filename=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null
-  $OPTIPNG -o7 --quiet $ASSETS_DIR/$1.png
-fi
-done
-
-cd $ASSETS_DIR
-cp -a archlinux.png arch.png
-cp -a gnu-linux.png linux.png
-cp -a gnu-linux.png unknown.png
-cp -a gnu-linux.png lfs.png
-cp -a manjaro.png Manjaro.i686.png
-cp -a manjaro.png Manjaro.x86_64.png
-cp -a driver.png memtest.png
-
-exit 0

assets/assets-white/render-logos-2k.sh

@@ -1,36 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="/usr/bin/inkscape"
-OPTIPNG="/usr/bin/optipng"
-
-INDEX="logos.txt"
-ASSETS_DIR="icons-2k"
-SRC_FILE="logos.svg"
-
-install -d $ASSETS_DIR
-
-for i in `cat $INDEX`
-do
-if [ -f $ASSETS_DIR/$i.png ]; then
-  echo $ASSETS_DIR/$i.png exists.
-else
-  echo
-  echo Rendering $ASSETS_DIR/$i.png
-  $INKSCAPE --export-id=$i \
-            --export-dpi=144 \
-            --export-id-only \
-            --export-filename=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null
-  $OPTIPNG -o7 --quiet $ASSETS_DIR/$1.png
-fi
-done
-
-cd $ASSETS_DIR
-cp -a archlinux.png arch.png
-cp -a gnu-linux.png linux.png
-cp -a gnu-linux.png unknown.png
-cp -a gnu-linux.png lfs.png
-cp -a manjaro.png Manjaro.i686.png
-cp -a manjaro.png Manjaro.x86_64.png
-cp -a driver.png memtest.png
-
-exit 0

assets/assets-white/render-logos-4k.sh

@@ -1,36 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="/usr/bin/inkscape"
-OPTIPNG="/usr/bin/optipng"
-
-INDEX="logos.txt"
-ASSETS_DIR="icons-4k"
-SRC_FILE="logos.svg"
-
-install -d $ASSETS_DIR
-
-for i in `cat $INDEX`
-do
-if [ -f $ASSETS_DIR/$i.png ]; then
-  echo $ASSETS_DIR/$i.png exists.
-else
-  echo
-  echo Rendering $ASSETS_DIR/$i.png
-  $INKSCAPE --export-id=$i \
-            --export-dpi=192 \
-            --export-id-only \
-            --export-filename=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null
-  $OPTIPNG -o7 --quiet $ASSETS_DIR/$1.png
-fi
-done
-
-cd $ASSETS_DIR
-cp -a archlinux.png arch.png
-cp -a gnu-linux.png linux.png
-cp -a gnu-linux.png unknown.png
-cp -a gnu-linux.png lfs.png
-cp -a manjaro.png Manjaro.i686.png
-cp -a manjaro.png Manjaro.x86_64.png
-cp -a driver.png memtest.png
-
-exit 0

assets/assets-white/render-select-1080p.sh

@@ -1,26 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="/usr/bin/inkscape"
-OPTIPNG="/usr/bin/optipng"
-
-INDEX="select.txt"
-ASSETS_DIR="select-1080p"
-SRC_FILE="select.svg"
-
-install -d $ASSETS_DIR
-
-for i in `cat $INDEX`
-do
-if [ -f $ASSETS_DIR/$i.png ]; then
-  echo $ASSETS_DIR/$i.png exists.
-else
-  echo
-  echo Rendering $ASSETS_DIR/$i.png
-  $INKSCAPE --export-id=$i \
-            --export-id-only \
-            --export-filename=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null
-  $OPTIPNG -o7 --quiet $ASSETS_DIR/$1.png
-fi
-done
-
-exit 0

assets/assets-white/render-select-2k.sh

@@ -1,27 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="/usr/bin/inkscape"
-OPTIPNG="/usr/bin/optipng"
-
-INDEX="select.txt"
-ASSETS_DIR="select-2k"
-SRC_FILE="select.svg"
-
-install -d $ASSETS_DIR
-
-for i in `cat $INDEX`
-do
-if [ -f $ASSETS_DIR/$i.png ]; then
-  echo $ASSETS_DIR/$i.png exists.
-else
-  echo
-  echo Rendering $ASSETS_DIR/$i.png
-  $INKSCAPE --export-id=$i \
-            --export-dpi=144 \
-            --export-id-only \
-            --export-filename=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null
-  $OPTIPNG -o7 --quiet $ASSETS_DIR/$1.png
-fi
-done
-
-exit 0

assets/assets-white/render-select-4k.sh

@@ -1,27 +0,0 @@
-#! /bin/bash
-
-INKSCAPE="/usr/bin/inkscape"
-OPTIPNG="/usr/bin/optipng"
-
-INDEX="select.txt"
-ASSETS_DIR="select-4k"
-SRC_FILE="select.svg"
-
-install -d $ASSETS_DIR
-
-for i in `cat $INDEX`
-do
-if [ -f $ASSETS_DIR/$i.png ]; then
-  echo $ASSETS_DIR/$i.png exists.
-else
-  echo
-  echo Rendering $ASSETS_DIR/$i.png
-  $INKSCAPE --export-id=$i \
-            --export-dpi=192 \
-            --export-id-only \
-            --export-filename=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null
-  $OPTIPNG -o7 --quiet $ASSETS_DIR/$1.png
-fi
-done
-
-exit 0

assets/logos.txt

@@ -1,10 +1,14 @@
+android
+anonymous
 antergos
+arcolinux
 elementary
 korora
 mageia
 steamos
 archlinux
 fedora
+freebsd
 kubuntu
 manjaro
 ubuntu
@@ -13,6 +17,7 @@ gentoo
 opensuse
 windows
 debian
+parrot
 gnu-linux
 linuxmint
 siduction
@@ -22,14 +27,17 @@ kali
 lubuntu
 solus
 kaos
+void
 macosx
 haiku
 endeavouros
-arcolinux
 pop-os
+mx-linux
 devuan
-void
-parrot
+4MLinux
+AlpineLinux
+SystemRescueCD
+
 recovery
 restart
 shutdown
@@ -45,8 +53,3 @@ lang
 type
 tz
 unset
-
-
-
-
-

assets/render-all.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+COLORS=("color" "white")
+TYPES=("icons" "select")
+RESOLUTIONS=("1080p" "2k" "4k")
+
+for COLOR in "${COLORS[@]}"; do
+  for TYPE in "${TYPES[@]}"; do
+    for RESOLUTION in "${RESOLUTIONS[@]}"; do
+      echo "./render-assets.sh \"$COLOR\" \"$TYPE\" \"$RESOLUTION\": "
+      ./render-assets.sh "$COLOR" "$TYPE" "$RESOLUTION"
+    done
+  done
+done

assets/render-assets.sh

@@ -0,0 +1,69 @@
+#!/bin/bash
+
+INKSCAPE="/usr/bin/inkscape"
+OPTIPNG="/usr/bin/optipng"
+
+if [[ "$1" == "color" ]]; then
+  cd "assets-color" || exit 1
+elif [[ "$1" == "white" ]]; then
+  cd "assets-white" || exit 1
+else
+  echo "Please use either 'color' or 'white'"
+  exit 1
+fi
+
+if [[ "$2" == "icons" ]]; then
+  EXPORT_TYPE="icons"
+  INDEX="../logos.txt"
+  SRC_FILE="../logos-$1.svg"
+elif [[ "$2" == "select" ]]; then
+  EXPORT_TYPE="select"
+  INDEX="../select.txt"
+  SRC_FILE="../select.svg"
+else
+  echo "Please use either 'icons' or 'select'"
+  exit 1
+fi
+
+if [[ "$3" == "1080p" ]]; then
+  ASSETS_DIR="$EXPORT_TYPE-1080p"
+  EXPORT_DPI="96"
+elif [[ "$3" == "2k" ]] || [[ "$3" == "2K" ]]; then
+  ASSETS_DIR="$EXPORT_TYPE-2k"
+  EXPORT_DPI="144"
+elif [[ "$3" == "4k" ]] || [[ "$3" == "4K" ]]; then
+  ASSETS_DIR="$EXPORT_TYPE-4k"
+  EXPORT_DPI="192"
+else
+  echo "Please use either '1080p', '2k' or '4k'"
+  exit 1
+fi
+
+install -d "$ASSETS_DIR"
+
+while read -r i; do
+  if [[ -f "$ASSETS_DIR/$i.png" ]]; then
+    echo "$ASSETS_DIR/$i.png exists"
+  elif [[ "$i" == "" ]]; then
+    continue
+  else
+    echo -e "\nRendering $ASSETS_DIR/$i.png"
+    $INKSCAPE "--export-id=$i" \
+              "--export-dpi=$EXPORT_DPI" \
+              "--export-id-only" \
+              "--export-filename=$ASSETS_DIR/$i.png" "$SRC_FILE" >/dev/null
+    #$OPTIPNG -o7 --quiet "$ASSETS_DIR/$i.png"
+  fi
+done < "$INDEX"
+
+if [[ "$EXPORT_TYPE" == "icons" ]]; then
+  cd $ASSETS_DIR || exit 1
+  cp -a archlinux.png arch.png
+  cp -a gnu-linux.png linux.png
+  cp -a gnu-linux.png unknown.png
+  cp -a gnu-linux.png lfs.png
+  cp -a manjaro.png Manjaro.i686.png
+  cp -a manjaro.png Manjaro.x86_64.png
+  cp -a driver.png memtest.png
+fi
+exit 0

config/theme-1080p_21:9.txt

@@ -3,7 +3,7 @@
 
 # Global Property
 title-text: ""
-desktop-image: "background.png"
+desktop-image: "background.jpg"
 desktop-color: "#000000"
 terminal-font: "Terminus Regular 14"
 terminal-box: "terminal_box_*.png"

install.sh

@@ -58,6 +58,7 @@ usage() {
   printf "  %-25s%s\n" "-v, --vimix" "vimix grub theme"
   printf "  %-25s%s\n" "-w, --white" "Install white icon version"
   printf "  %-25s%s\n" "-u, --ultrawide" "Install 2560x1080 background image - not available for slaze grub theme"
+  printf "  %-25s%s\n" "-C, --custom-background" "Use either background.jpg or custom-background.jpg as theme background instead"
   printf "  %-25s%s\n" "-2, --2k" "Install 2k(2560x1440) background image"
   printf "  %-25s%s\n" "-4, --4k" "Install 4k(3840x2160) background image"
   printf "  %-25s%s\n" "-r, --remove" "Remove theme (must add theme name option)"
@@ -90,6 +91,12 @@ install() {
     local screen="1080p"
   fi
 
+  if [[ ${custom_background} == 'custom-background' ]]; then
+    local custom_background="custom-background"
+  else
+    local custom_background="default-background"
+  fi
+
   if [[ ${screen} == '1080p_21:9' && ${name} == 'Slaze' ]]; then
     prompt -e "ultrawide 1080p does not support Slaze theme"
     exit 1
@@ -105,6 +112,17 @@ install() {
   if [ "$UID" -eq "$ROOT_UID" ]; then
     clear
 
+    if [[ "${custom_background}" == "custom-background" ]]; then
+      if [[ -f "background.jpg" ]]; then
+        custom_background="background.jpg"
+      elif [[ -f "custom-background.jpg" ]]; then
+        custom_background="custom-background.jpg"
+      else
+        prompt -e "Neither background.jpg, or custom-background.jpg could be found, exiting"
+        exit 0
+      fi
+    fi
+
     # Create themes directory if not exists
     echo -e "\n Checking for the existence of themes directory..."
 
@@ -116,7 +134,20 @@ install() {
 
     cp -a "${REO_DIR}/common/"{*.png,*.pf2} "${THEME_DIR}/${name}"
     cp -a "${REO_DIR}/config/theme-${screen}.txt" "${THEME_DIR}/${name}/theme.txt"
-    cp -a "${REO_DIR}/backgrounds/${screen}/background-${theme}.jpg" "${THEME_DIR}/${name}/background.jpg"
+
+    if [[ ${custom_background} == "background.jpg" ]] || [[ ${custom_background} == "custom-background.jpg" ]]; then
+      if [[ -f "$custom_background" ]]; then
+        prompt -i "\n Using ${custom_background} as background image..."
+        cp -a "${REO_DIR}/${custom_background}" "${THEME_DIR}/${name}/background.jpg"
+        convert -auto-orient "${THEME_DIR}/${name}/background.jpg" "${THEME_DIR}/${name}/background.jpg"
+      else
+        prompt -e "$custom_background couldn't be found, exiting"
+        exit 0
+      fi
+    else
+      cp -a "${REO_DIR}/backgrounds/${screen}/background-${theme}.jpg" "${THEME_DIR}/${name}/background.jpg"
+    fi
+
     if [[ ${screen} == '1080p_21:9' ]]; then
       cp -a "${REO_DIR}/assets/assets-${icon}/icons-1080p" "${THEME_DIR}/${name}/icons"
       cp -a "${REO_DIR}/assets/assets-${icon}/select-1080p/"*.png "${THEME_DIR}/${name}"
@@ -131,27 +162,48 @@ install() {
     # Backup grub config
     cp -an /etc/default/grub /etc/default/grub.bak
 
-    grep "GRUB_THEME=" /etc/default/grub 2>&1 >/dev/null && sed -i '/GRUB_THEME=/d' /etc/default/grub
-    grep "GRUB_GFXMODE=" /etc/default/grub 2>&1 >/dev/null && sed -i '/GRUB_GFXMODE=/d' /etc/default/grub
-
-    # Edit grub config
-    echo "GRUB_THEME=\"${THEME_DIR}/${name}/theme.txt\"" >> /etc/default/grub
+    if grep "GRUB_THEME=" /etc/default/grub 2>&1 >/dev/null; then
+      #Replace GRUB_THEME
+      sed -i "s|.*GRUB_THEME=.*|GRUB_THEME=\"${THEME_DIR}/${name}/theme.txt\"|" /etc/default/grub
+    else
+      #Append GRUB_THEME
+      echo "GRUB_THEME=\"${THEME_DIR}/${name}/theme.txt\"" >> /etc/default/grub
+    fi
 
     # Make sure set the right resolution for grub
     if [[ ${screen} == '1080p' ]]; then
-      echo "GRUB_GFXMODE=1920x1080,auto" >> /etc/default/grub
+      gfxmode="GRUB_GFXMODE=1920x1080,auto"
     elif [[ ${screen} == '1080p_21:9' ]]; then
-      echo "GRUB_GFXMODE=2560x1080,auto" >> /etc/default/grub
+      gfxmode="GRUB_GFXMODE=2560x1080,auto"
     elif [[ ${screen} == '4k' ]]; then
-      echo "GRUB_GFXMODE=3840x2160,auto" >> /etc/default/grub
+      gfxmode="GRUB_GFXMODE=3840x2160,auto"
     elif [[ ${screen} == '2k' ]]; then
-      echo "GRUB_GFXMODE=2560x1440,auto" >> /etc/default/grub
+      gfxmode="GRUB_GFXMODE=2560x1440,auto"
+    fi
+
+    if grep "GRUB_GFXMODE=" /etc/default/grub 2>&1 >/dev/null; then
+      #Replace GRUB_GFXMODE
+      sed -i "s|.*GRUB_GFXMODE=.*|${gfxmode}|" /etc/default/grub
+    else
+      #Append GRUB_GFXMODE
+      echo "${gfxmode}" >> /etc/default/grub
+    fi
+
+    if grep "GRUB_TERMINAL=console" /etc/default/grub 2>&1 >/dev/null || grep "GRUB_TERMINAL=\"console\"" /etc/default/grub 2>&1 >/dev/null; then
+      #Replace GRUB_TERMINAL
+      sed -i "s|.*GRUB_TERMINAL=.*|#GRUB_TERMINAL=console|" /etc/default/grub
+    fi
+
+    if grep "GRUB_TERMINAL_OUTPUT=console" /etc/default/grub 2>&1 >/dev/null || grep "GRUB_TERMINAL_OUTPUT=\"console\"" /etc/default/grub 2>&1 >/dev/null; then
+      #Replace GRUB_TERMINAL_OUTPUT
+      sed -i "s|.*GRUB_TERMINAL_OUTPUT=.*|#GRUB_TERMINAL_OUTPUT=console|" /etc/default/grub
     fi
 
     # Update grub config
     prompt -i "\n Updating grub config...\n"
 
     updating_grub
+    prompt -w "\n * At the next restart of your computer you will see your new Grub theme: '$theme' "
   else
     # Error message
     prompt -e "\n [ Error! ] -> Run me as root! "
@@ -165,7 +217,7 @@ install() {
         read -p "[ Trusted ] Specify the root password : " -t${MAX_DELAY} -s
         [[ -n "$REPLY" ]] && {
         if [[ -n "${theme}" && -n "${screen}" ]]; then
-            sudo -S <<< $REPLY $0 --${theme} --${icon} --${screen}
+          sudo -S <<< $REPLY "$0" --${theme} --${icon} --${screen}
         fi
         } || {
              operation_canceled
@@ -188,6 +240,7 @@ run_dialog() {
         prompt -e "\n [ Error! ] -> wrong passwords"
         exit 1
     }
+
     tui=$(dialog --backtitle ${Project_Name} \
     --radiolist "Choose your Grub theme : " 15 40 5 \
       1 "Vimix Theme" off  \
@@ -247,7 +300,6 @@ updating_grub() {
 
   # Success message
   prompt -s "\n * All done!"
-  prompt -w "\n * At the next restart of your computer you will see your new Grub theme: '$theme' "
 }
 
 install_dialog() {
@@ -311,7 +363,7 @@ remove() {
     read -p "[ trusted ] specify the root password : " -t${MAX_DELAY} -s
     [[ -n "$REPLY" ]] && {
       if [[ -n "${theme}" ]]; then
-        sudo -S <<< $REPLY $0 --remove --${theme}
+        sudo -S <<< $REPLY "$0" "${PROG_ARGS[@]}"
       fi
     } || {
       operation_canceled
@@ -338,6 +390,7 @@ if [[ $# -lt 1 ]] && [[ $UID -ne $ROOT_UID ]] && [[ ! -x /usr/bin/dialog ]] ;  t
 fi
 
 while [[ $# -ge 1 ]]; do
+  PROG_ARGS+=("${1}")
   case "${1}" in
     -b|--boot)
       THEME_DIR="/boot/grub/themes"
@@ -372,6 +425,9 @@ while [[ $# -ge 1 ]]; do
     -u|--ultrawide|--1080p_21:9)
       screen='1080p_21:9'
       ;;
+    -C|--custom-background|--custom)
+      custom_background='custom-background'
+      ;;
     -r|--remove)
       remove='true'
       ;;