Only install fonts if necessary

This commit is contained in:
Manuel Thalmann 2023-04-01 15:39:29 +02:00
parent 8f01104ce2
commit ba6e073aea
4 changed files with 11 additions and 5 deletions

View file

@ -7,7 +7,7 @@ source "../../scripts/Scripts/prepare.sh";
source "../../scripts/OS/PopOS/install.sh"; source "../../scripts/OS/PopOS/install.sh";
source "../../scripts/Devices/SurfaceBook2/Setup/install.sh"; source "../../scripts/Devices/SurfaceBook2/Setup/install.sh";
source "../../scripts/Software/Collections/school.sh"; source "../../scripts/Software/Collections/school.sh";
source "../../scripts/Config/UserProfile/school.sh"; INSTALL_FONTS=1 source "../../scripts/Config/UserProfile/school.sh";
# Install equalizer # Install equalizer
source "../../scripts/Config/EasyEffects/SurfaceBook2/install.sh"; source "../../scripts/Config/EasyEffects/SurfaceBook2/install.sh";

View file

@ -6,7 +6,7 @@ sudo hostnamectl set-hostname ManuPopOSLive;
source "../../scripts/Scripts/prepare.sh"; source "../../scripts/Scripts/prepare.sh";
source "../../scripts/OS/PopOS/install.sh"; source "../../scripts/OS/PopOS/install.sh";
source "../../scripts/Software/Collections/personal.sh"; source "../../scripts/Software/Collections/personal.sh";
source "../../scripts/Config/UserProfile/personal.sh"; INSTALL_FONTS=1 source "../../scripts/Config/UserProfile/personal.sh";
source "../../scripts/Scripts/postinstall.sh"; source "../../scripts/Scripts/postinstall.sh";
popd > /dev/null; popd > /dev/null;

View file

@ -1,4 +1,5 @@
#!/bin/bash #!/bin/bash
INSTALL_FONTS="${INSTALL_FONTS}";
dir="${BASH_SOURCE%/*}"; dir="${BASH_SOURCE%/*}";
pushd "$dir" > /dev/null; pushd "$dir" > /dev/null;
scriptRoot="$dir/../.."; scriptRoot="$dir/../..";
@ -11,9 +12,13 @@ cloudRoot="$configRoot/rclone";
pushd "$dir" > /dev/null; pushd "$dir" > /dev/null;
gnome-terminal --tab --wait -- /bin/bash "../../Config/rclone/InstallSync.sh" nextcloud Nextcloud; gnome-terminal --tab --wait -- /bin/bash "../../Config/rclone/InstallSync.sh" nextcloud Nextcloud;
# Install fonts if [ ! -z "$INSTALL_FONTS" ]
source "../../Config/Fonts/NerdFont/install.sh"; then
source "../../Software/Oh My Posh/install.sh"; # Install fonts
source "../../Config/Fonts/NerdFont/install.sh";
source "../../Software/Oh My Posh/install.sh";
fi
popd > /dev/null; popd > /dev/null;
} & } &

View file

@ -1,6 +1,7 @@
#!/bin/bash #!/bin/bash
# Install JetBrains Stuff # Install JetBrains Stuff
pushd "${BASH_SOURCE%/*}" > /dev/null; pushd "${BASH_SOURCE%/*}" > /dev/null;
INSTALL_FONTS="${INSTALL_FONTS}";
source "./personal.sh"; source "./personal.sh";
source "../../Software/JetBrains/install-toolbox.sh"; source "../../Software/JetBrains/install-toolbox.sh";
popd > /dev/null; popd > /dev/null;