From 93d4c0aeed897b9693e0a46bde0e09cc0d1d206a Mon Sep 17 00:00:00 2001 From: zenobit Date: Sat, 18 Mar 2023 14:53:27 +0100 Subject: [PATCH] renaming --- config/1stRun.sh | 15 ++++--- config/{vms_icons => icons}/absolute.svg | 0 config/{vms_icons => icons}/academix.svg | 0 config/{vms_icons => icons}/agarimos.png | Bin config/{vms_icons => icons}/aix.svg | 0 config/{vms_icons => icons}/alma.svg | 0 config/{vms_icons => icons}/alpine.svg | 0 config/{vms_icons => icons}/android.svg | 0 config/{vms_icons => icons}/antix.svg | 0 config/{vms_icons => icons}/arch.svg | 0 config/{vms_icons => icons}/archbang.svg | 0 config/{vms_icons => icons}/archcraft.svg | 0 config/{vms_icons => icons}/archlabs.svg | 0 config/{vms_icons => icons}/archlinux.svg | 0 config/{vms_icons => icons}/archman.svg | 0 config/{vms_icons => icons}/arcolinux.svg | 0 config/{vms_icons => icons}/artix.svg | 0 config/{vms_icons => icons}/aryalinux.svg | 0 config/{vms_icons => icons}/backbox.svg | 0 config/{vms_icons => icons}/batocera.svg | 0 config/{vms_icons => icons}/blackarch.svg | 0 config/{vms_icons => icons}/blendos.svg | 0 config/{vms_icons => icons}/bodhi-linux.svg | 0 config/{vms_icons => icons}/bunsenlabs.svg | 0 config/{vms_icons => icons}/cachyos.svg | 0 config/{vms_icons => icons}/centos-stream.svg | 0 config/{vms_icons => icons}/cereus.svg | 0 config/{vms_icons => icons}/condres.svg | 0 config/{vms_icons => icons}/debian.svg | 0 config/{vms_icons => icons}/deepin.svg | 0 config/{vms_icons => icons}/devuan.svg | 0 config/{vms_icons => icons}/dietpi.png | Bin config/{vms_icons => icons}/dragonflybsd.svg | 0 config/{vms_icons => icons}/elementary.svg | 0 config/{vms_icons => icons}/endeavoros.svg | 0 config/{vms_icons => icons}/endeavouros.svg | 0 config/{vms_icons => icons}/endless.svg | 0 config/{vms_icons => icons}/fedora.svg | 0 config/{vms_icons => icons}/freebsd.svg | 0 config/{vms_icons => icons}/freedos.svg | 0 config/{vms_icons => icons}/gabeeos.png | Bin config/{vms_icons => icons}/garuda.svg | 0 config/{vms_icons => icons}/gentoo.svg | 0 config/{vms_icons => icons}/ghostbsd.svg | 0 config/{vms_icons => icons}/haiku.png | Bin config/{vms_icons => icons}/hyperbola.svg | 0 config/{vms_icons => icons}/kali.svg | 0 config/{vms_icons => icons}/kaos.svg | 0 config/{vms_icons => icons}/kdeneon.svg | 0 config/{vms_icons => icons}/knoppix.svg | 0 config/{vms_icons => icons}/kolibrios.png | Bin config/{vms_icons => icons}/korora.svg | 0 config/{vms_icons => icons}/kubuntu.svg | 0 config/{vms_icons => icons}/linux-lite.svg | 0 .../linuxmint-cinnamon.svg | 0 config/{vms_icons => icons}/linuxmint.svg | 0 config/{vms_icons => icons}/lmde.svg | 0 config/{vms_icons => icons}/lubuntu.svg | 0 config/{vms_icons => icons}/lxle.svg | 0 config/{vms_icons => icons}/mac.svg | 0 config/{vms_icons => icons}/macos.svg | 0 config/{vms_icons => icons}/madlinux.svg | 0 config/{vms_icons => icons}/mageia.png | Bin config/{vms_icons => icons}/manjaro.svg | 0 config/{vms_icons => icons}/midnightbsd.svg | 0 config/{vms_icons => icons}/ms-dos.svg | 0 config/{vms_icons => icons}/mx.svg | 0 config/{vms_icons => icons}/mxlinux.svg | 0 config/{vms_icons => icons}/netboot.svg | 0 config/{vms_icons => icons}/netbsd.svg | 0 config/{vms_icons => icons}/netrunner.svg | 0 config/{vms_icons => icons}/nixos.svg | 0 config/{vms_icons => icons}/openbsd.svg | 0 config/{vms_icons => icons}/openmandriva.svg | 0 config/{vms_icons => icons}/opensuse.svg | 0 config/{vms_icons => icons}/oraclelinux.svg | 0 config/{vms_icons => icons}/parrot.svg | 0 config/{vms_icons => icons}/pclinuxos.svg | 0 config/{vms_icons => icons}/pisilinux.svg | 0 config/{vms_icons => icons}/pop-os.svg | 0 config/{vms_icons => icons}/popos.svg | 0 config/{vms_icons => icons}/puppy-linux.svg | 0 config/{vms_icons => icons}/pureos.svg | 0 config/{vms_icons => icons}/raspbian.svg | 0 config/{vms_icons => icons}/reactos.svg | 0 config/{vms_icons => icons}/rebornos.svg | 0 config/{vms_icons => icons}/regolith.svg | 0 config/{vms_icons => icons}/rhel.svg | 0 config/{vms_icons => icons}/rockylinux.svg | 0 config/{vms_icons => icons}/rosa.svg | 0 config/{vms_icons => icons}/salentos.svg | 0 config/{vms_icons => icons}/siduction.svg | 0 config/{vms_icons => icons}/slackware.svg | 0 config/{vms_icons => icons}/slitaz.png | Bin config/{vms_icons => icons}/smartos.svg | 0 config/{vms_icons => icons}/solus.svg | 0 config/{vms_icons => icons}/steamos.svg | 0 config/{vms_icons => icons}/tails.svg | 0 config/{vms_icons => icons}/truenas-core.svg | 0 config/{vms_icons => icons}/truenas-scale.svg | 0 config/{vms_icons => icons}/trueos.svg | 0 config/{vms_icons => icons}/tux.svg | 0 config/{vms_icons => icons}/ubuntu-budgie.svg | 0 config/{vms_icons => icons}/ubuntu-kylin.svg | 0 config/{vms_icons => icons}/ubuntu-mate.svg | 0 config/{vms_icons => icons}/ubuntu-studio.svg | 0 config/{vms_icons => icons}/ubuntu-unity.png | Bin config/{vms_icons => icons}/ubuntu.svg | 0 config/{vms_icons => icons}/ubuntukylin.svg | 0 config/{vms_icons => icons}/ubuntustudio.svg | 0 .../{vms_icons => icons}/ultimate-edition.svg | 0 config/{vms_icons => icons}/void.svg | 0 config/{vms_icons => icons}/voidpup.png | Bin config/{vms_icons => icons}/voyager.svg | 0 config/{vms_icons => icons}/vxlinux.svg | 0 config/{vms_icons => icons}/windows.svg | 0 config/{vms_icons => icons}/xerolinux.svg | 0 config/{vms_icons => icons}/xubuntu.svg | 0 config/{vms_icons => icons}/zorin.svg | 0 config/renew.sh | 38 ++++++++++-------- 120 files changed, 28 insertions(+), 25 deletions(-) rename config/{vms_icons => icons}/absolute.svg (100%) rename config/{vms_icons => icons}/academix.svg (100%) rename config/{vms_icons => icons}/agarimos.png (100%) rename config/{vms_icons => icons}/aix.svg (100%) rename config/{vms_icons => icons}/alma.svg (100%) rename config/{vms_icons => icons}/alpine.svg (100%) rename config/{vms_icons => icons}/android.svg (100%) rename config/{vms_icons => icons}/antix.svg (100%) rename config/{vms_icons => icons}/arch.svg (100%) rename config/{vms_icons => icons}/archbang.svg (100%) rename config/{vms_icons => icons}/archcraft.svg (100%) rename config/{vms_icons => icons}/archlabs.svg (100%) rename config/{vms_icons => icons}/archlinux.svg (100%) rename config/{vms_icons => icons}/archman.svg (100%) rename config/{vms_icons => icons}/arcolinux.svg (100%) rename config/{vms_icons => icons}/artix.svg (100%) rename config/{vms_icons => icons}/aryalinux.svg (100%) rename config/{vms_icons => icons}/backbox.svg (100%) rename config/{vms_icons => icons}/batocera.svg (100%) rename config/{vms_icons => icons}/blackarch.svg (100%) rename config/{vms_icons => icons}/blendos.svg (100%) rename config/{vms_icons => icons}/bodhi-linux.svg (100%) rename config/{vms_icons => icons}/bunsenlabs.svg (100%) rename config/{vms_icons => icons}/cachyos.svg (100%) rename config/{vms_icons => icons}/centos-stream.svg (100%) rename config/{vms_icons => icons}/cereus.svg (100%) rename config/{vms_icons => icons}/condres.svg (100%) rename config/{vms_icons => icons}/debian.svg (100%) rename config/{vms_icons => icons}/deepin.svg (100%) rename config/{vms_icons => icons}/devuan.svg (100%) rename config/{vms_icons => icons}/dietpi.png (100%) rename config/{vms_icons => icons}/dragonflybsd.svg (100%) rename config/{vms_icons => icons}/elementary.svg (100%) rename config/{vms_icons => icons}/endeavoros.svg (100%) rename config/{vms_icons => icons}/endeavouros.svg (100%) rename config/{vms_icons => icons}/endless.svg (100%) rename config/{vms_icons => icons}/fedora.svg (100%) rename config/{vms_icons => icons}/freebsd.svg (100%) rename config/{vms_icons => icons}/freedos.svg (100%) rename config/{vms_icons => icons}/gabeeos.png (100%) rename config/{vms_icons => icons}/garuda.svg (100%) rename config/{vms_icons => icons}/gentoo.svg (100%) rename config/{vms_icons => icons}/ghostbsd.svg (100%) rename config/{vms_icons => icons}/haiku.png (100%) rename config/{vms_icons => icons}/hyperbola.svg (100%) rename config/{vms_icons => icons}/kali.svg (100%) rename config/{vms_icons => icons}/kaos.svg (100%) rename config/{vms_icons => icons}/kdeneon.svg (100%) rename config/{vms_icons => icons}/knoppix.svg (100%) rename config/{vms_icons => icons}/kolibrios.png (100%) rename config/{vms_icons => icons}/korora.svg (100%) rename config/{vms_icons => icons}/kubuntu.svg (100%) rename config/{vms_icons => icons}/linux-lite.svg (100%) rename config/{vms_icons => icons}/linuxmint-cinnamon.svg (100%) rename config/{vms_icons => icons}/linuxmint.svg (100%) rename config/{vms_icons => icons}/lmde.svg (100%) rename config/{vms_icons => icons}/lubuntu.svg (100%) rename config/{vms_icons => icons}/lxle.svg (100%) rename config/{vms_icons => icons}/mac.svg (100%) rename config/{vms_icons => icons}/macos.svg (100%) rename config/{vms_icons => icons}/madlinux.svg (100%) rename config/{vms_icons => icons}/mageia.png (100%) rename config/{vms_icons => icons}/manjaro.svg (100%) rename config/{vms_icons => icons}/midnightbsd.svg (100%) rename config/{vms_icons => icons}/ms-dos.svg (100%) rename config/{vms_icons => icons}/mx.svg (100%) rename config/{vms_icons => icons}/mxlinux.svg (100%) rename config/{vms_icons => icons}/netboot.svg (100%) rename config/{vms_icons => icons}/netbsd.svg (100%) rename config/{vms_icons => icons}/netrunner.svg (100%) rename config/{vms_icons => icons}/nixos.svg (100%) rename config/{vms_icons => icons}/openbsd.svg (100%) rename config/{vms_icons => icons}/openmandriva.svg (100%) rename config/{vms_icons => icons}/opensuse.svg (100%) rename config/{vms_icons => icons}/oraclelinux.svg (100%) rename config/{vms_icons => icons}/parrot.svg (100%) rename config/{vms_icons => icons}/pclinuxos.svg (100%) rename config/{vms_icons => icons}/pisilinux.svg (100%) rename config/{vms_icons => icons}/pop-os.svg (100%) rename config/{vms_icons => icons}/popos.svg (100%) rename config/{vms_icons => icons}/puppy-linux.svg (100%) rename config/{vms_icons => icons}/pureos.svg (100%) rename config/{vms_icons => icons}/raspbian.svg (100%) rename config/{vms_icons => icons}/reactos.svg (100%) rename config/{vms_icons => icons}/rebornos.svg (100%) rename config/{vms_icons => icons}/regolith.svg (100%) rename config/{vms_icons => icons}/rhel.svg (100%) rename config/{vms_icons => icons}/rockylinux.svg (100%) rename config/{vms_icons => icons}/rosa.svg (100%) rename config/{vms_icons => icons}/salentos.svg (100%) rename config/{vms_icons => icons}/siduction.svg (100%) rename config/{vms_icons => icons}/slackware.svg (100%) rename config/{vms_icons => icons}/slitaz.png (100%) rename config/{vms_icons => icons}/smartos.svg (100%) rename config/{vms_icons => icons}/solus.svg (100%) rename config/{vms_icons => icons}/steamos.svg (100%) rename config/{vms_icons => icons}/tails.svg (100%) rename config/{vms_icons => icons}/truenas-core.svg (100%) rename config/{vms_icons => icons}/truenas-scale.svg (100%) rename config/{vms_icons => icons}/trueos.svg (100%) rename config/{vms_icons => icons}/tux.svg (100%) rename config/{vms_icons => icons}/ubuntu-budgie.svg (100%) rename config/{vms_icons => icons}/ubuntu-kylin.svg (100%) rename config/{vms_icons => icons}/ubuntu-mate.svg (100%) rename config/{vms_icons => icons}/ubuntu-studio.svg (100%) rename config/{vms_icons => icons}/ubuntu-unity.png (100%) rename config/{vms_icons => icons}/ubuntu.svg (100%) rename config/{vms_icons => icons}/ubuntukylin.svg (100%) rename config/{vms_icons => icons}/ubuntustudio.svg (100%) rename config/{vms_icons => icons}/ultimate-edition.svg (100%) rename config/{vms_icons => icons}/void.svg (100%) rename config/{vms_icons => icons}/voidpup.png (100%) rename config/{vms_icons => icons}/voyager.svg (100%) rename config/{vms_icons => icons}/vxlinux.svg (100%) rename config/{vms_icons => icons}/windows.svg (100%) rename config/{vms_icons => icons}/xerolinux.svg (100%) rename config/{vms_icons => icons}/xubuntu.svg (100%) rename config/{vms_icons => icons}/zorin.svg (100%) diff --git a/config/1stRun.sh b/config/1stRun.sh index 434be36..0ea5afc 100755 --- a/config/1stRun.sh +++ b/config/1stRun.sh @@ -6,23 +6,22 @@ CONFIG_DIR="$HOME/.config/distrohopper" # create default dirs rm -r "$CONFIG_DIR" -mkdir -p "$CONFIG_DIR" "$CONFIG_DIR/vms_ready" "$CONFIG_DIR/vms_supported" "$CONFIG_DIR/vms_icons" +mkdir -p "$CONFIG_DIR" +sudo mkdir -p "$ICON_DIR" -# copy icons -#cp -r vms_icons "$CONFIG_DIR/" # copy everything to config dir cp -r * "$CONFIG_DIR/" - +# move icons +sudo mv "$CONFIG_DIR/icons/"* "$ICON_DIR/" +rm -r "$CONFIG_DIR/icons" # install prerequisities (Void linux) - - # Install distrohopper to all users -sudo cp ../dh ../quickgui ../quicktui ../quickget ../quickemu /usr/bin/ +sudo cp ../dh ../quickget ../quickemu ../macrecovery ../windowskey /usr/bin/ # Renew VMs "$CONFIG_DIR/renew.sh" # Set VMs dir -"$CONFIG_DIR/set_dir.sh" +#"$CONFIG_DIR/set_dir.sh" echo "Done" diff --git a/config/vms_icons/absolute.svg b/config/icons/absolute.svg similarity index 100% rename from config/vms_icons/absolute.svg rename to config/icons/absolute.svg diff --git a/config/vms_icons/academix.svg b/config/icons/academix.svg similarity index 100% rename from config/vms_icons/academix.svg rename to config/icons/academix.svg diff --git a/config/vms_icons/agarimos.png b/config/icons/agarimos.png similarity index 100% rename from config/vms_icons/agarimos.png rename to config/icons/agarimos.png diff --git a/config/vms_icons/aix.svg b/config/icons/aix.svg similarity index 100% rename from config/vms_icons/aix.svg rename to config/icons/aix.svg diff --git a/config/vms_icons/alma.svg b/config/icons/alma.svg similarity index 100% rename from config/vms_icons/alma.svg rename to config/icons/alma.svg diff --git a/config/vms_icons/alpine.svg b/config/icons/alpine.svg similarity index 100% rename from config/vms_icons/alpine.svg rename to config/icons/alpine.svg diff --git a/config/vms_icons/android.svg b/config/icons/android.svg similarity index 100% rename from config/vms_icons/android.svg rename to config/icons/android.svg diff --git a/config/vms_icons/antix.svg b/config/icons/antix.svg similarity index 100% rename from config/vms_icons/antix.svg rename to config/icons/antix.svg diff --git a/config/vms_icons/arch.svg b/config/icons/arch.svg similarity index 100% rename from config/vms_icons/arch.svg rename to config/icons/arch.svg diff --git a/config/vms_icons/archbang.svg b/config/icons/archbang.svg similarity index 100% rename from config/vms_icons/archbang.svg rename to config/icons/archbang.svg diff --git a/config/vms_icons/archcraft.svg b/config/icons/archcraft.svg similarity index 100% rename from config/vms_icons/archcraft.svg rename to config/icons/archcraft.svg diff --git a/config/vms_icons/archlabs.svg b/config/icons/archlabs.svg similarity index 100% rename from config/vms_icons/archlabs.svg rename to config/icons/archlabs.svg diff --git a/config/vms_icons/archlinux.svg b/config/icons/archlinux.svg similarity index 100% rename from config/vms_icons/archlinux.svg rename to config/icons/archlinux.svg diff --git a/config/vms_icons/archman.svg b/config/icons/archman.svg similarity index 100% rename from config/vms_icons/archman.svg rename to config/icons/archman.svg diff --git a/config/vms_icons/arcolinux.svg b/config/icons/arcolinux.svg similarity index 100% rename from config/vms_icons/arcolinux.svg rename to config/icons/arcolinux.svg diff --git a/config/vms_icons/artix.svg b/config/icons/artix.svg similarity index 100% rename from config/vms_icons/artix.svg rename to config/icons/artix.svg diff --git a/config/vms_icons/aryalinux.svg b/config/icons/aryalinux.svg similarity index 100% rename from config/vms_icons/aryalinux.svg rename to config/icons/aryalinux.svg diff --git a/config/vms_icons/backbox.svg b/config/icons/backbox.svg similarity index 100% rename from config/vms_icons/backbox.svg rename to config/icons/backbox.svg diff --git a/config/vms_icons/batocera.svg b/config/icons/batocera.svg similarity index 100% rename from config/vms_icons/batocera.svg rename to config/icons/batocera.svg diff --git a/config/vms_icons/blackarch.svg b/config/icons/blackarch.svg similarity index 100% rename from config/vms_icons/blackarch.svg rename to config/icons/blackarch.svg diff --git a/config/vms_icons/blendos.svg b/config/icons/blendos.svg similarity index 100% rename from config/vms_icons/blendos.svg rename to config/icons/blendos.svg diff --git a/config/vms_icons/bodhi-linux.svg b/config/icons/bodhi-linux.svg similarity index 100% rename from config/vms_icons/bodhi-linux.svg rename to config/icons/bodhi-linux.svg diff --git a/config/vms_icons/bunsenlabs.svg b/config/icons/bunsenlabs.svg similarity index 100% rename from config/vms_icons/bunsenlabs.svg rename to config/icons/bunsenlabs.svg diff --git a/config/vms_icons/cachyos.svg b/config/icons/cachyos.svg similarity index 100% rename from config/vms_icons/cachyos.svg rename to config/icons/cachyos.svg diff --git a/config/vms_icons/centos-stream.svg b/config/icons/centos-stream.svg similarity index 100% rename from config/vms_icons/centos-stream.svg rename to config/icons/centos-stream.svg diff --git a/config/vms_icons/cereus.svg b/config/icons/cereus.svg similarity index 100% rename from config/vms_icons/cereus.svg rename to config/icons/cereus.svg diff --git a/config/vms_icons/condres.svg b/config/icons/condres.svg similarity index 100% rename from config/vms_icons/condres.svg rename to config/icons/condres.svg diff --git a/config/vms_icons/debian.svg b/config/icons/debian.svg similarity index 100% rename from config/vms_icons/debian.svg rename to config/icons/debian.svg diff --git a/config/vms_icons/deepin.svg b/config/icons/deepin.svg similarity index 100% rename from config/vms_icons/deepin.svg rename to config/icons/deepin.svg diff --git a/config/vms_icons/devuan.svg b/config/icons/devuan.svg similarity index 100% rename from config/vms_icons/devuan.svg rename to config/icons/devuan.svg diff --git a/config/vms_icons/dietpi.png b/config/icons/dietpi.png similarity index 100% rename from config/vms_icons/dietpi.png rename to config/icons/dietpi.png diff --git a/config/vms_icons/dragonflybsd.svg b/config/icons/dragonflybsd.svg similarity index 100% rename from config/vms_icons/dragonflybsd.svg rename to config/icons/dragonflybsd.svg diff --git a/config/vms_icons/elementary.svg b/config/icons/elementary.svg similarity index 100% rename from config/vms_icons/elementary.svg rename to config/icons/elementary.svg diff --git a/config/vms_icons/endeavoros.svg b/config/icons/endeavoros.svg similarity index 100% rename from config/vms_icons/endeavoros.svg rename to config/icons/endeavoros.svg diff --git a/config/vms_icons/endeavouros.svg b/config/icons/endeavouros.svg similarity index 100% rename from config/vms_icons/endeavouros.svg rename to config/icons/endeavouros.svg diff --git a/config/vms_icons/endless.svg b/config/icons/endless.svg similarity index 100% rename from config/vms_icons/endless.svg rename to config/icons/endless.svg diff --git a/config/vms_icons/fedora.svg b/config/icons/fedora.svg similarity index 100% rename from config/vms_icons/fedora.svg rename to config/icons/fedora.svg diff --git a/config/vms_icons/freebsd.svg b/config/icons/freebsd.svg similarity index 100% rename from config/vms_icons/freebsd.svg rename to config/icons/freebsd.svg diff --git a/config/vms_icons/freedos.svg b/config/icons/freedos.svg similarity index 100% rename from config/vms_icons/freedos.svg rename to config/icons/freedos.svg diff --git a/config/vms_icons/gabeeos.png b/config/icons/gabeeos.png similarity index 100% rename from config/vms_icons/gabeeos.png rename to config/icons/gabeeos.png diff --git a/config/vms_icons/garuda.svg b/config/icons/garuda.svg similarity index 100% rename from config/vms_icons/garuda.svg rename to config/icons/garuda.svg diff --git a/config/vms_icons/gentoo.svg b/config/icons/gentoo.svg similarity index 100% rename from config/vms_icons/gentoo.svg rename to config/icons/gentoo.svg diff --git a/config/vms_icons/ghostbsd.svg b/config/icons/ghostbsd.svg similarity index 100% rename from config/vms_icons/ghostbsd.svg rename to config/icons/ghostbsd.svg diff --git a/config/vms_icons/haiku.png b/config/icons/haiku.png similarity index 100% rename from config/vms_icons/haiku.png rename to config/icons/haiku.png diff --git a/config/vms_icons/hyperbola.svg b/config/icons/hyperbola.svg similarity index 100% rename from config/vms_icons/hyperbola.svg rename to config/icons/hyperbola.svg diff --git a/config/vms_icons/kali.svg b/config/icons/kali.svg similarity index 100% rename from config/vms_icons/kali.svg rename to config/icons/kali.svg diff --git a/config/vms_icons/kaos.svg b/config/icons/kaos.svg similarity index 100% rename from config/vms_icons/kaos.svg rename to config/icons/kaos.svg diff --git a/config/vms_icons/kdeneon.svg b/config/icons/kdeneon.svg similarity index 100% rename from config/vms_icons/kdeneon.svg rename to config/icons/kdeneon.svg diff --git a/config/vms_icons/knoppix.svg b/config/icons/knoppix.svg similarity index 100% rename from config/vms_icons/knoppix.svg rename to config/icons/knoppix.svg diff --git a/config/vms_icons/kolibrios.png b/config/icons/kolibrios.png similarity index 100% rename from config/vms_icons/kolibrios.png rename to config/icons/kolibrios.png diff --git a/config/vms_icons/korora.svg b/config/icons/korora.svg similarity index 100% rename from config/vms_icons/korora.svg rename to config/icons/korora.svg diff --git a/config/vms_icons/kubuntu.svg b/config/icons/kubuntu.svg similarity index 100% rename from config/vms_icons/kubuntu.svg rename to config/icons/kubuntu.svg diff --git a/config/vms_icons/linux-lite.svg b/config/icons/linux-lite.svg similarity index 100% rename from config/vms_icons/linux-lite.svg rename to config/icons/linux-lite.svg diff --git a/config/vms_icons/linuxmint-cinnamon.svg b/config/icons/linuxmint-cinnamon.svg similarity index 100% rename from config/vms_icons/linuxmint-cinnamon.svg rename to config/icons/linuxmint-cinnamon.svg diff --git a/config/vms_icons/linuxmint.svg b/config/icons/linuxmint.svg similarity index 100% rename from config/vms_icons/linuxmint.svg rename to config/icons/linuxmint.svg diff --git a/config/vms_icons/lmde.svg b/config/icons/lmde.svg similarity index 100% rename from config/vms_icons/lmde.svg rename to config/icons/lmde.svg diff --git a/config/vms_icons/lubuntu.svg b/config/icons/lubuntu.svg similarity index 100% rename from config/vms_icons/lubuntu.svg rename to config/icons/lubuntu.svg diff --git a/config/vms_icons/lxle.svg b/config/icons/lxle.svg similarity index 100% rename from config/vms_icons/lxle.svg rename to config/icons/lxle.svg diff --git a/config/vms_icons/mac.svg b/config/icons/mac.svg similarity index 100% rename from config/vms_icons/mac.svg rename to config/icons/mac.svg diff --git a/config/vms_icons/macos.svg b/config/icons/macos.svg similarity index 100% rename from config/vms_icons/macos.svg rename to config/icons/macos.svg diff --git a/config/vms_icons/madlinux.svg b/config/icons/madlinux.svg similarity index 100% rename from config/vms_icons/madlinux.svg rename to config/icons/madlinux.svg diff --git a/config/vms_icons/mageia.png b/config/icons/mageia.png similarity index 100% rename from config/vms_icons/mageia.png rename to config/icons/mageia.png diff --git a/config/vms_icons/manjaro.svg b/config/icons/manjaro.svg similarity index 100% rename from config/vms_icons/manjaro.svg rename to config/icons/manjaro.svg diff --git a/config/vms_icons/midnightbsd.svg b/config/icons/midnightbsd.svg similarity index 100% rename from config/vms_icons/midnightbsd.svg rename to config/icons/midnightbsd.svg diff --git a/config/vms_icons/ms-dos.svg b/config/icons/ms-dos.svg similarity index 100% rename from config/vms_icons/ms-dos.svg rename to config/icons/ms-dos.svg diff --git a/config/vms_icons/mx.svg b/config/icons/mx.svg similarity index 100% rename from config/vms_icons/mx.svg rename to config/icons/mx.svg diff --git a/config/vms_icons/mxlinux.svg b/config/icons/mxlinux.svg similarity index 100% rename from config/vms_icons/mxlinux.svg rename to config/icons/mxlinux.svg diff --git a/config/vms_icons/netboot.svg b/config/icons/netboot.svg similarity index 100% rename from config/vms_icons/netboot.svg rename to config/icons/netboot.svg diff --git a/config/vms_icons/netbsd.svg b/config/icons/netbsd.svg similarity index 100% rename from config/vms_icons/netbsd.svg rename to config/icons/netbsd.svg diff --git a/config/vms_icons/netrunner.svg b/config/icons/netrunner.svg similarity index 100% rename from config/vms_icons/netrunner.svg rename to config/icons/netrunner.svg diff --git a/config/vms_icons/nixos.svg b/config/icons/nixos.svg similarity index 100% rename from config/vms_icons/nixos.svg rename to config/icons/nixos.svg diff --git a/config/vms_icons/openbsd.svg b/config/icons/openbsd.svg similarity index 100% rename from config/vms_icons/openbsd.svg rename to config/icons/openbsd.svg diff --git a/config/vms_icons/openmandriva.svg b/config/icons/openmandriva.svg similarity index 100% rename from config/vms_icons/openmandriva.svg rename to config/icons/openmandriva.svg diff --git a/config/vms_icons/opensuse.svg b/config/icons/opensuse.svg similarity index 100% rename from config/vms_icons/opensuse.svg rename to config/icons/opensuse.svg diff --git a/config/vms_icons/oraclelinux.svg b/config/icons/oraclelinux.svg similarity index 100% rename from config/vms_icons/oraclelinux.svg rename to config/icons/oraclelinux.svg diff --git a/config/vms_icons/parrot.svg b/config/icons/parrot.svg similarity index 100% rename from config/vms_icons/parrot.svg rename to config/icons/parrot.svg diff --git a/config/vms_icons/pclinuxos.svg b/config/icons/pclinuxos.svg similarity index 100% rename from config/vms_icons/pclinuxos.svg rename to config/icons/pclinuxos.svg diff --git a/config/vms_icons/pisilinux.svg b/config/icons/pisilinux.svg similarity index 100% rename from config/vms_icons/pisilinux.svg rename to config/icons/pisilinux.svg diff --git a/config/vms_icons/pop-os.svg b/config/icons/pop-os.svg similarity index 100% rename from config/vms_icons/pop-os.svg rename to config/icons/pop-os.svg diff --git a/config/vms_icons/popos.svg b/config/icons/popos.svg similarity index 100% rename from config/vms_icons/popos.svg rename to config/icons/popos.svg diff --git a/config/vms_icons/puppy-linux.svg b/config/icons/puppy-linux.svg similarity index 100% rename from config/vms_icons/puppy-linux.svg rename to config/icons/puppy-linux.svg diff --git a/config/vms_icons/pureos.svg b/config/icons/pureos.svg similarity index 100% rename from config/vms_icons/pureos.svg rename to config/icons/pureos.svg diff --git a/config/vms_icons/raspbian.svg b/config/icons/raspbian.svg similarity index 100% rename from config/vms_icons/raspbian.svg rename to config/icons/raspbian.svg diff --git a/config/vms_icons/reactos.svg b/config/icons/reactos.svg similarity index 100% rename from config/vms_icons/reactos.svg rename to config/icons/reactos.svg diff --git a/config/vms_icons/rebornos.svg b/config/icons/rebornos.svg similarity index 100% rename from config/vms_icons/rebornos.svg rename to config/icons/rebornos.svg diff --git a/config/vms_icons/regolith.svg b/config/icons/regolith.svg similarity index 100% rename from config/vms_icons/regolith.svg rename to config/icons/regolith.svg diff --git a/config/vms_icons/rhel.svg b/config/icons/rhel.svg similarity index 100% rename from config/vms_icons/rhel.svg rename to config/icons/rhel.svg diff --git a/config/vms_icons/rockylinux.svg b/config/icons/rockylinux.svg similarity index 100% rename from config/vms_icons/rockylinux.svg rename to config/icons/rockylinux.svg diff --git a/config/vms_icons/rosa.svg b/config/icons/rosa.svg similarity index 100% rename from config/vms_icons/rosa.svg rename to config/icons/rosa.svg diff --git a/config/vms_icons/salentos.svg b/config/icons/salentos.svg similarity index 100% rename from config/vms_icons/salentos.svg rename to config/icons/salentos.svg diff --git a/config/vms_icons/siduction.svg b/config/icons/siduction.svg similarity index 100% rename from config/vms_icons/siduction.svg rename to config/icons/siduction.svg diff --git a/config/vms_icons/slackware.svg b/config/icons/slackware.svg similarity index 100% rename from config/vms_icons/slackware.svg rename to config/icons/slackware.svg diff --git a/config/vms_icons/slitaz.png b/config/icons/slitaz.png similarity index 100% rename from config/vms_icons/slitaz.png rename to config/icons/slitaz.png diff --git a/config/vms_icons/smartos.svg b/config/icons/smartos.svg similarity index 100% rename from config/vms_icons/smartos.svg rename to config/icons/smartos.svg diff --git a/config/vms_icons/solus.svg b/config/icons/solus.svg similarity index 100% rename from config/vms_icons/solus.svg rename to config/icons/solus.svg diff --git a/config/vms_icons/steamos.svg b/config/icons/steamos.svg similarity index 100% rename from config/vms_icons/steamos.svg rename to config/icons/steamos.svg diff --git a/config/vms_icons/tails.svg b/config/icons/tails.svg similarity index 100% rename from config/vms_icons/tails.svg rename to config/icons/tails.svg diff --git a/config/vms_icons/truenas-core.svg b/config/icons/truenas-core.svg similarity index 100% rename from config/vms_icons/truenas-core.svg rename to config/icons/truenas-core.svg diff --git a/config/vms_icons/truenas-scale.svg b/config/icons/truenas-scale.svg similarity index 100% rename from config/vms_icons/truenas-scale.svg rename to config/icons/truenas-scale.svg diff --git a/config/vms_icons/trueos.svg b/config/icons/trueos.svg similarity index 100% rename from config/vms_icons/trueos.svg rename to config/icons/trueos.svg diff --git a/config/vms_icons/tux.svg b/config/icons/tux.svg similarity index 100% rename from config/vms_icons/tux.svg rename to config/icons/tux.svg diff --git a/config/vms_icons/ubuntu-budgie.svg b/config/icons/ubuntu-budgie.svg similarity index 100% rename from config/vms_icons/ubuntu-budgie.svg rename to config/icons/ubuntu-budgie.svg diff --git a/config/vms_icons/ubuntu-kylin.svg b/config/icons/ubuntu-kylin.svg similarity index 100% rename from config/vms_icons/ubuntu-kylin.svg rename to config/icons/ubuntu-kylin.svg diff --git a/config/vms_icons/ubuntu-mate.svg b/config/icons/ubuntu-mate.svg similarity index 100% rename from config/vms_icons/ubuntu-mate.svg rename to config/icons/ubuntu-mate.svg diff --git a/config/vms_icons/ubuntu-studio.svg b/config/icons/ubuntu-studio.svg similarity index 100% rename from config/vms_icons/ubuntu-studio.svg rename to config/icons/ubuntu-studio.svg diff --git a/config/vms_icons/ubuntu-unity.png b/config/icons/ubuntu-unity.png similarity index 100% rename from config/vms_icons/ubuntu-unity.png rename to config/icons/ubuntu-unity.png diff --git a/config/vms_icons/ubuntu.svg b/config/icons/ubuntu.svg similarity index 100% rename from config/vms_icons/ubuntu.svg rename to config/icons/ubuntu.svg diff --git a/config/vms_icons/ubuntukylin.svg b/config/icons/ubuntukylin.svg similarity index 100% rename from config/vms_icons/ubuntukylin.svg rename to config/icons/ubuntukylin.svg diff --git a/config/vms_icons/ubuntustudio.svg b/config/icons/ubuntustudio.svg similarity index 100% rename from config/vms_icons/ubuntustudio.svg rename to config/icons/ubuntustudio.svg diff --git a/config/vms_icons/ultimate-edition.svg b/config/icons/ultimate-edition.svg similarity index 100% rename from config/vms_icons/ultimate-edition.svg rename to config/icons/ultimate-edition.svg diff --git a/config/vms_icons/void.svg b/config/icons/void.svg similarity index 100% rename from config/vms_icons/void.svg rename to config/icons/void.svg diff --git a/config/vms_icons/voidpup.png b/config/icons/voidpup.png similarity index 100% rename from config/vms_icons/voidpup.png rename to config/icons/voidpup.png diff --git a/config/vms_icons/voyager.svg b/config/icons/voyager.svg similarity index 100% rename from config/vms_icons/voyager.svg rename to config/icons/voyager.svg diff --git a/config/vms_icons/vxlinux.svg b/config/icons/vxlinux.svg similarity index 100% rename from config/vms_icons/vxlinux.svg rename to config/icons/vxlinux.svg diff --git a/config/vms_icons/windows.svg b/config/icons/windows.svg similarity index 100% rename from config/vms_icons/windows.svg rename to config/icons/windows.svg diff --git a/config/vms_icons/xerolinux.svg b/config/icons/xerolinux.svg similarity index 100% rename from config/vms_icons/xerolinux.svg rename to config/icons/xerolinux.svg diff --git a/config/vms_icons/xubuntu.svg b/config/icons/xubuntu.svg similarity index 100% rename from config/vms_icons/xubuntu.svg rename to config/icons/xubuntu.svg diff --git a/config/vms_icons/zorin.svg b/config/icons/zorin.svg similarity index 100% rename from config/vms_icons/zorin.svg rename to config/icons/zorin.svg diff --git a/config/renew.sh b/config/renew.sh index 1c6608e..2715f7b 100755 --- a/config/renew.sh +++ b/config/renew.sh @@ -1,4 +1,6 @@ #!/bin/bash +# shellcheck source=./distrohopper.conf + export LC_ALL=C echo "Updating VMs..." @@ -7,18 +9,19 @@ CONFIG_DIR="$HOME/.config/distrohopper" source "$CONFIG_DIR/distrohopper.conf" # shellcheck source=distrohopper.conf # remove desktop files (ready to run VMs) -rm "$CONFIG_DIR/vms_ready/*" +rm -r "$CONFIG_DIR/ready" +mkdir "$CONFIG_DIR/ready" # Enter ditrohopper VMs dir -cd "$QUICKEMU_VMS_DIR" || exit +cd "$VMS_DIR" || exit # check for VMs .conf files (ready to run VMs) -for vm_config_file in *.conf; do - vm_desktop_file=$(basename "$QUICKEMU_VMS_DIR/$vm_config_file" .conf) +for vm_conf in *.conf; do + vm_desktop=$(basename "$VMS_DIR/$vm_conf" .conf) # Use fuzzy matching to find the best matching icon file (ready to run VMs) - icon_name=$(basename "$QUICKEMU_VMS_DIR/$vm_config_file" .conf | cut -d'-' -f -2) + icon_name=$(basename "$VMS_DIR/$vm_conf" .conf | cut -d'-' -f -2) icon_file=$(find "$ICON_DIR" -type f -iname "${icon_name// /}.*") # If no icon was found, try shorter name (ready to run VMs) if [ -z "$icon_file" ]; then - icon_name=$(basename "$QUICKEMU_VMS_DIR/$vm_config_file" .conf | cut -d'-' -f1) + icon_name=$(basename "$VMS_DIR/$vm_conf" .conf | cut -d'-' -f1) icon_file=$(find "$ICON_DIR" -type f -iname "${icon_name// /}.*") fi # If no icon was found, use a default icon (ready to run VMs) @@ -28,22 +31,23 @@ for vm_config_file in *.conf; do # content of desktop files (ready to run VMs) desktop_file_content="[Desktop Entry] Type=Application -Name=$vm_desktop_file -Exec=sh -c 'cd "$QUICKEMU_VMS_DIR" && quickemu -vm \"$vm_config_file\"' +Name=$vm_desktop +Exec=sh -c 'cd \"$VMS_DIR\" && quickemu -vm \"$vm_conf\"' Icon=$icon_file Categories=System;Virtualization;" # create desktop files (ready to run VMs) - echo "$desktop_file_content" > "$CONFIG_DIR"/vms_ready/"$vm_desktop_file".desktop + echo "$desktop_file_content" > "$CONFIG_DIR"/ready/"$vm_desktop".desktop done # remove desktop files (supported VMs) -rm "$CONFIG_DIR"/vms_supported/"*" +rm -r "$CONFIG_DIR/supported" +mkdir "$CONFIG_DIR/supported" # get supported VMs quickget | sed 1d | cut -d':' -f2 | grep -o '[^ ]*' > "$CONFIG_DIR/supported.md" while read -r get_name; do - vm_desktop_file=$(echo "$get_name" | tr ' ' '_') - releases=$(quickget "$vm_desktop_file" | grep 'Releases' | cut -d':' -f2 | sed 's/^ //') - editions=$(quickget "$vm_desktop_file" | grep 'Editions' | cut -d':' -f2 | sed 's/^ //') + vm_desktop=$(echo "$get_name" | tr ' ' '_') + releases=$(quickget "$vm_desktop" | grep 'Releases' | cut -d':' -f2 | sed 's/^ //') + editions=$(quickget "$vm_desktop" | grep 'Editions' | cut -d':' -f2 | sed 's/^ //') icon_name="$ICON_DIR/$get_name" if [ -f "$icon_name.svg" ]; then icon_file="$icon_name.svg" @@ -60,10 +64,10 @@ Type=Application Name=$get_name releases=$releases replace='\"!\"' -Exec=sh -c 'cd "$QUICKEMU_VMS_DIR" && yad --form --field=\"Release:CB\" \"${releases// /$replace}\" | cut -d\"|\" -f1 | xargs -I{} sh -c \"quickget $get_name {}\"' +Exec=sh -c 'cd \"$VMS_DIR\" && yad --form --field=\"Release:CB\" \"${releases// /$replace}\" | cut -d\"|\" -f1 | xargs -I{} sh -c \"quickget $get_name {}\"' Icon=$icon_file Categories=System;Virtualization;" - echo "$desktop_file_content" > "$CONFIG_DIR"/vms_supported/"$vm_desktop_file".desktop + echo "$desktop_file_content" > "$CONFIG_DIR"/supported/"$vm_desktop".desktop else # Create desktop file for VMs with editions desktop_file_content="[Desktop Entry] @@ -72,9 +76,9 @@ Name=$get_name releases=$releases editions=$editions replace=$replace -Exec=sh -c 'cd \"$QUICKEMU_VMS_DIR\" && yad --form --separator=\" \" --field=\"Release:CB\" \"${releases// /$replace}\" --field=\"Edition:CB\" \"${editions// /$replace}\" | xargs -I{} sh -c \"quickget $get_name {}\"' +Exec=sh -c 'cd \"$VMS_DIR\" && yad --form --separator=\" \" --field=\"Release:CB\" \"${releases// /$replace}\" --field=\"Edition:CB\" \"${editions// /$replace}\" | xargs -I{} sh -c \"quickget $get_name {}\"' Icon=$icon_file Categories=System;Virtualization;" - echo "$desktop_file_content" > "$CONFIG_DIR"/vms_supported/"$vm_desktop_file".desktop + echo "$desktop_file_content" > "$CONFIG_DIR"/supported/"$vm_desktop".desktop fi done < "$CONFIG_DIR"/supported.md