From 9a4a4b6789563cc23edcf95cbb1cca91d432001c Mon Sep 17 00:00:00 2001 From: zenobit Date: Sun, 19 Mar 2023 23:54:17 +0100 Subject: [PATCH] prepare 0.5 release --- config/1stRun.sh | 9 +- config/distrohopper.conf | 5 +- config/icons/agarimos.svg | 111 ------------- config/icons/hop.svg | 337 ++++++++++++++++++++++++++++++-------- config/set_dir.sh | 14 +- dh | 11 +- 6 files changed, 288 insertions(+), 199 deletions(-) delete mode 100644 config/icons/agarimos.svg diff --git a/config/1stRun.sh b/config/1stRun.sh index 875b7d4..25a6069 100755 --- a/config/1stRun.sh +++ b/config/1stRun.sh @@ -5,7 +5,6 @@ source distrohopper.conf CONFIG_DIR="$HOME/.config/distrohopper" # create default dirs -rm -r "$CONFIG_DIR" mkdir -p "$CONFIG_DIR" sudo mkdir -p "$ICON_DIR" @@ -19,10 +18,12 @@ rm -r "$CONFIG_DIR/icons" # Install distrohopper to all users sudo cp ../dh ../quickget ../quickemu ../macrecovery ../windowskey /usr/bin/ -# Renew VMs -"$CONFIG_DIR/renew.sh" - # Set VMs dir "$CONFIG_DIR/set_dir.sh" +source distrohopper.conf + +# Renew VMs +"$CONFIG_DIR/renew.sh" + echo "Done" diff --git a/config/distrohopper.conf b/config/distrohopper.conf index b6815ee..3df7ec8 100644 --- a/config/distrohopper.conf +++ b/config/distrohopper.conf @@ -1,8 +1,5 @@ -# quickyad config file -#SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" -VMS_DIR="/home/zen/VMS" ICON_DIR="/usr/share/icons/distroicons" TERMINAL=sakura replace='"!"' -export "VMS_DIR" "CONFIG_DIR" "ICON_DIR" "TERMINAL" "replace" +export "CONFIG_DIR" "ICON_DIR" "TERMINAL" "replace" diff --git a/config/icons/agarimos.svg b/config/icons/agarimos.svg deleted file mode 100644 index bbedffc..0000000 --- a/config/icons/agarimos.svg +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - diff --git a/config/icons/hop.svg b/config/icons/hop.svg index 45ea92c..853d621 100644 --- a/config/icons/hop.svg +++ b/config/icons/hop.svg @@ -1,105 +1,298 @@ - - - - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - - - + + + - - - - - + + + + + - - - + + + - - - - - - - + + + + + + + - - - - - - + + + + + + -image/svg+xmlOpenclipartCartoon Grasshopper2009-11-24T19:25:36Cartoon Grasshopper in the style of Lemmling.https://openclipart.org/detail/28477/cartoon-grasshopper-by-studiofibonacciStudioFibonaccibugcartooncricketgrasshopperinsect +image/svg+xmlOpenclipart2009-11-24T19:25:36Cartoon Grasshopper in the style of Lemmling.https://openclipart.org/detail/28477/cartoon-grasshopper-by-studiofibonacciStudioFibonaccibugcartooncricketgrasshopperinsect diff --git a/config/set_dir.sh b/config/set_dir.sh index 9f08bb4..f83fe4a 100755 --- a/config/set_dir.sh +++ b/config/set_dir.sh @@ -1,8 +1,12 @@ #!/bin/bash + source distrohopper.conf + NEWDIR="$(yad --file --directory --title="Where to save VMs?")" -QUICKEMU_VMS_DIR="$NEWDIR" -export QUICKEMU_VMS_DIR -echo "New dir is: $QUICKEMU_VMS_DIR" -#cat distrohopper.conf | grep 'QUICKEMU_VMS_DIR=' -#sed -f distrohopper.conf --posix -E 's/QUICKEMU_VMS_DIR="$HOME/.local/share/quickemu"/QUICKEMU_VMS_DIR="$QUICKEMU_VMS_DIR"/g' +VMS_DIR="$NEWDIR" + +echo "VMS_DIR=\"$VMS_DIR\" +export \"VMS_DIR\"" >> distrohopper.conf + +export VMS_DIR +echo "New dir is: $VMS_DIR" diff --git a/dh b/dh index e097cc9..a161c95 100755 --- a/dh +++ b/dh @@ -5,7 +5,14 @@ progname="${progname:="${0##*/}"}" version="0.4" GTK_THEME="alt-dialog" CONFIG_DIR="$HOME/.config/distrohopper" -source "$CONFIG_DIR/distrohopper.conf" +ICON_DIR="/usr/share/icons/distroicons" +TERMINAL=sakura +replace='"!"' +export "CONFIG_DIR" "ICON_DIR" "TERMINAL" "replace" + +cd "$VMS_DIR" + +#source "$CONFIG_DIR/distrohopper.conf" # Set traps to catch the signals and exit gracefully trap "exit" INT trap "exit" EXIT @@ -99,8 +106,6 @@ else # run GUI key=$((RANDOM % 9000 + 1000)) GTK_THEME="alt-dialog" - CONFIG_DIR="$HOME/.config/distrohopper" - source "$CONFIG_DIR/distrohopper.conf" yad --plug="$key" --tabnum=1 --monitor --icons --listen --read-dir="$CONFIG_DIR"/ready --sort-by-name --no-buttons --borders=0 --icon-size=48 --item-width=76 & yad --plug="$key" --tabnum=2 --monitor --icons --listen --read-dir="$CONFIG_DIR"/supported --sort-by-name --no-buttons --borders=0 --icon-size=48 --item-width=76 & yad --plug="$key" --tabnum=3 --monitor --icons --listen --read-dir="$CONFIG_DIR" --sort-by-name --no-buttons --borders=0 --icon-size=48 --item-width=76 &