Enhance resolving of source files

This commit is contained in:
Manuel Thalmann 2023-03-16 20:06:14 +01:00
parent 0f91200315
commit c7b345c034
12 changed files with 70 additions and 71 deletions

View file

@ -1,21 +1,16 @@
#!/bin/bash #!/bin/bash
dir="${BASH_SOURCE%/*}"; pushd "${BASH_SOURCE%/*}";
scriptRoot="$dir/../../scripts";
utilRoot="$scriptRoot/Scripts";
deviceRoot="$scriptRoot/Devices";
osRoot="$scriptRoot/OS";
softwareRoot="$scriptRoot/Software";
configRoot="$scriptRoot/Config";
# Set Hostname # Set Hostname
sudo hostnamectl set-hostname ManuSurface; sudo hostnamectl set-hostname ManuSurface;
source "$utilRoot/prepare.sh";
source "$osRoot/PopOS/install.sh"; source "../../scripts/Scripts/prepare.sh";
source "$deviceRoot/SurfaceBook2/Setup/install.sh"; source "../../scripts/OS/PopOS/install.sh";
source "$softwareRoot/Collections/school.sh"; source "../../scripts/Devices/SurfaceBook2/Setup/install.sh";
source "$configRoot/UserProfile/school.sh"; source "../../scripts/Software/Collections/school.sh";
source "../../scripts/Config/UserProfile/school.sh";
# Install equalizer # Install equalizer
source "$configRoot/EasyEffects/SurfaceBook2/install.sh"; source "../../scripts/Config/EasyEffects/SurfaceBook2/install.sh";
source "$utilRoot/postinstall.sh"; source "../../scripts/Scripts/postinstall.sh";
popd;

View file

@ -1,17 +1,12 @@
#!/bin/bash #!/bin/bash
dir="${BASH_SOURCE%/*}"; pushd "${BASH_SOURCE%/*}";
scriptRoot="$dir/../../scripts";
utilRoot="$scriptRoot/Scripts";
deviceRoot="$scriptRoot/Devices";
osRoot="$scriptRoot/OS";
softwareRoot="$scriptRoot/Software";
configRoot="$scriptRoot/Config";
# Set Hostname # Set Hostname
sudo hostnamectl set-hostname ManuPopOSLive; sudo hostnamectl set-hostname ManuPopOSLive;
source "$utilRoot/prepare.sh"; source "../../scripts/Scripts/prepare.sh";
source "$osRoot/PopOS/install.sh"; source "../../scripts/OS/PopOS/install.sh";
source "$softwareRoot/Collections/personal.sh"; source "../../scripts/Software/Collections/personal.sh";
source "$configRoot/UserProfile/personal.sh"; source "../../scripts/Config/UserProfile/personal.sh";
source "$utilRoot/postinstall.sh"; source "../../scripts/Scripts/postinstall.sh";
popd;

View file

@ -16,6 +16,7 @@ else
git clone https://aur.archlinux.org/ttf-ms-win11-auto.git ttf-win11; git clone https://aur.archlinux.org/ttf-ms-win11-auto.git ttf-win11;
cd ttf-win11; cd ttf-win11;
# shellcheck source=/dev/null
source ./PKGBUILD; source ./PKGBUILD;
prepare; prepare;
package_ttf-ms-win11-auto; package_ttf-ms-win11-auto;

View file

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
dir="${BASH_SOURCE%/*}"; dir="${BASH_SOURCE%/*}";
pushd "$dir";
scriptRoot="$dir/../.."; scriptRoot="$dir/../..";
softwareRoot="$scriptRoot/Software"; softwareRoot="$scriptRoot/Software";
configRoot="$scriptRoot/Config"; configRoot="$scriptRoot/Config";
@ -7,18 +8,21 @@ cloudRoot="$configRoot/rclone";
# Sync clouds # Sync clouds
{ {
gnome-terminal --tab --wait -- /bin/bash "$cloudRoot/InstallSync.sh" nextcloud Nextcloud; pushd "$dir";
gnome-terminal --tab --wait -- /bin/bash "../../Config/rclone/InstallSync.sh" nextcloud Nextcloud;
# Install fonts # Install fonts
source "$configRoot/Fonts/NerdFont/install.sh"; source "../../Config/Fonts/NerdFont/install.sh";
source "$softwareRoot/Oh My Posh/install.sh"; source "../../Software/Oh My Posh/install.sh";
popd;
} & } &
# Microsoft Windows Fonts # Microsoft Windows Fonts
source "$configRoot/Fonts/MicrosoftFonts/install.sh"; source "../../Config/Fonts/MicrosoftFonts/install.sh";
# Git Config # Git Config
source "$configRoot/git/setup/install.sh"; source "../../Config/git/setup/install.sh";
# Troll Stuff # Troll Stuff
source "$configRoot/git/git-auf-deutsch/install.sh"; source "../../Config/git/git-auf-deutsch/install.sh";
popd;

View file

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

View file

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
dir="${BASH_SOURCE%/*}"; pushd "${BASH_SOURCE%/*}";
deviceRoot="$dir/../..";
# Install surface-linux # Install surface-linux
source "$deviceRoot/Surface/LinuxSurface/install.sh"; source "../../Surface/LinuxSurface/install.sh";
source "$deviceRoot/SurfaceBook2/Camera/install.sh"; source "../../SurfaceBook2/Camera/install.sh";
# source "$deviceRoot/SurfaceBook2/SecureBoot/install.sh"; # source "../../SurfaceBook2/SecureBoot/install.sh";
popd;

View file

@ -1,3 +1,4 @@
#!/bin/bash #!/bin/bash
dir="${BASH_SOURCE%/*}"; pushd "${BASH_SOURCE%/*}";
source "$dir/../../Config/GnomeExtensions/install.sh"; source "../../Config/GnomeExtensions/install.sh";
popd;

View file

@ -1,34 +1,34 @@
#!/bin/bash #!/bin/bash
dir="${BASH_SOURCE%/*}"; pushd "${BASH_SOURCE%/*}";
scriptRoot="$dir/../.."; scriptRoot="$dir/../..";
utilRoot="$scriptRoot/Scripts"; utilRoot="$scriptRoot/Scripts";
deviceRoot="$scriptRoot/Devices"; deviceRoot="$scriptRoot/Devices";
softwareRoot="$scriptRoot/Software"; softwareRoot="$scriptRoot/Software";
configRoot="$scriptRoot/Config"; configRoot="$scriptRoot/Config";
source "$softwareRoot/rclone/install.sh"; source "../../Software/rclone/install.sh";
# Install Brave # Install Brave
source "$softwareRoot/Brave/install-stable.sh"; source "../../Software/Brave/install-stable.sh";
source "$softwareRoot/Brave/install-beta.sh"; source "../../Software/Brave/install-beta.sh";
source "$softwareRoot/Brave/install-nightly.sh"; source "../../Software/Brave/install-nightly.sh";
source "$softwareRoot/Brave/install-extensions.sh"; source "../../Software/Brave/install-extensions.sh";
source "$softwareRoot/Google Chrome/install.sh"; source "../../Software/Google Chrome/install.sh";
# Install further software # Install further software
source "$softwareRoot/git/install.sh"; source "../../Software/git/install.sh";
source "$softwareRoot/logo-ls/install.sh"; source "../../Software/logo-ls/install.sh";
source "$softwareRoot/VSCodium/install.sh"; source "../../Software/VSCodium/install.sh";
source "$softwareRoot/Visual Studio Code/install.sh"; source "../../Software/Visual Studio Code/install.sh";
source "$softwareRoot/Node.js/install.sh"; source "../../Software/Node.js/install.sh";
source "$softwareRoot/Python/install.sh"; source "../../Software/Python/install.sh";
source "$softwareRoot/tea/install.sh"; source "../../Software/tea/install.sh";
source "$softwareRoot/Godot/install.sh"; source "../../Software/Godot/install.sh";
source "$softwareRoot/Virtual Machine Manager/install.sh"; source "../../Software/Virtual Machine Manager/install.sh";
source "$softwareRoot/Woodpecker CLI/install.sh"; source "../../Software/Woodpecker CLI/install.sh";
# Install General Packages from APT # Install General Packages from APT
source "$softwareRoot/common-apt/install.sh"; source "../../Software/common-apt/install.sh";
# Install other flatpaks # Install other flatpaks
flatpak install -y flathub com.bitwarden.desktop; flatpak install -y flathub com.bitwarden.desktop;
@ -39,3 +39,4 @@ flatpak install -y flathub com.github.wwmm.easyeffects;
flatpak install -y flathub ch.threema.threema-web-desktop; flatpak install -y flathub ch.threema.threema-web-desktop;
flatpak install -y flathub app.ytmdesktop.ytmdesktop; flatpak install -y flathub app.ytmdesktop.ytmdesktop;
flatpak install -y flathub com.github.tchx84.Flatseal; flatpak install -y flathub com.github.tchx84.Flatseal;
popd;

View file

@ -1,11 +1,11 @@
#!/bin/bash #!/bin/bash
dir="${BASH_SOURCE%/*}"; pushd "${BASH_SOURCE%/*}";
softwareRoot="$dir/.."; source "./personal.sh";
source "$dir/personal.sh";
source "$softwareRoot/Java/install.sh"; source "../Java/install.sh";
source "$softwareRoot/cloudflared/install.sh"; source "../cloudflared/install.sh";
# Install other flatpaks # Install other flatpaks
flatpak install -y flathub com.github.xournalpp.xournalpp; flatpak install -y flathub com.github.xournalpp.xournalpp;
flatpak install -y flathub com.github.flxzt.rnote; flatpak install -y flathub com.github.flxzt.rnote;
popd;

View file

@ -4,7 +4,7 @@ if [ ! "$UID" -eq 0 ]
then then
sudo bash "$BASH_SOURCE"; sudo bash "$BASH_SOURCE";
curl -s "https://get.sdkman.io" | bash; curl -s "https://get.sdkman.io" | bash;
source "$HOME/.sdkman/bin/sdkman-init.sh"; source "~/.sdkman/bin/sdkman-init.sh";
sdk install gradle 7.5.1; sdk install gradle 7.5.1;
else else
apt install -y wget apt-transport-https; apt install -y wget apt-transport-https;

View file

@ -1,6 +1,7 @@
#!/bin/bash #!/bin/bash
export NVS_HOME="$HOME/.nvs"; export NVS_HOME="$HOME/.nvs";
git clone https://github.com/jasongin/nvs "$NVS_HOME"; git clone https://github.com/jasongin/nvs "$NVS_HOME";
# shellcheck source=~/.nvs/nvs.sh
. "$NVS_HOME/nvs.sh" install; . "$NVS_HOME/nvs.sh" install;
bash -c 'exec bash -c "nvs add latest"'; bash -c 'exec bash -c "nvs add latest"';
bash -c 'exec bash -c "nvs link latest"'; bash -c 'exec bash -c "nvs link latest"';

View file

@ -1,4 +1,5 @@
#!/bin/bash #!/bin/bash
dir="${BASH_SOURCE%/*}"; pushd "${BASH_SOURCE%/*}";
source "$dir/setup.sh"; source "./setup.sh";
source "$dir/pyenv.sh"; source "./pyenv.sh";
popd;