diff --git a/profiles/ManuSurface/setup.sh b/profiles/ManuSurface/setup.sh index 7b17517f..2f5ad2c8 100755 --- a/profiles/ManuSurface/setup.sh +++ b/profiles/ManuSurface/setup.sh @@ -1,82 +1,82 @@ #!/bin/bash -dir="${BASH_SOURCE%/*}" -scriptRoot="$dir/../../scripts" -deviceRoot="$scriptRoot/Devices" -softwareRoot="$scriptRoot/Software" -configRoot="$scriptRoot/Config" -cloudRoot="$configRoot/rclone" +dir="${BASH_SOURCE%/*}"; +scriptRoot="$dir/../../scripts"; +deviceRoot="$scriptRoot/Devices"; +softwareRoot="$scriptRoot/Software"; +configRoot="$scriptRoot/Config"; +cloudRoot="$configRoot/rclone"; # Set Hostname -sudo hostnamectl set-hostname ManuSurface +sudo hostnamectl set-hostname ManuSurface; # Preparation sudo apt update -sudo apt upgrade -y -sudo apt install dbus-x11 +sudo apt upgrade -y; +sudo apt install dbus-x11; # Install gnome extensions -source "$configRoot/GnomeExtensions/install.sh" +source "$configRoot/GnomeExtensions/install.sh"; # Sync clouds -source "$softwareRoot/rclone/install.sh" +source "$softwareRoot/rclone/install.sh"; { - gnome-terminal --tab --wait -- /bin/bash -c "source '$cloudRoot/NextcloudSync/install.sh'" + gnome-terminal --tab --wait -- /bin/bash -c "source '$cloudRoot/NextcloudSync/install.sh'"; # Install fonts - source "$configRoot/Fonts/NerdFont/install.sh" - source "$softwareRoot/Oh My Posh/install.sh" + source "$configRoot/Fonts/NerdFont/install.sh"; + source "$softwareRoot/Oh My Posh/install.sh"; } & # Install surface-linux -source "$deviceRoot/Surface/LinuxSurface/install.sh" -source "$deviceRoot/SurfaceBook2/Camera/install.sh" -# source "$deviceRoot/SurfaceBook2/SecureBoot/install.sh" +source "$deviceRoot/Surface/LinuxSurface/install.sh"; +source "$deviceRoot/SurfaceBook2/Camera/install.sh"; +# source "$deviceRoot/SurfaceBook2/SecureBoot/install.sh"; # Install Brave -source "$softwareRoot/Brave/install-stable.sh" -source "$softwareRoot/Brave/install-beta.sh" -source "$softwareRoot/Brave/install-nightly.sh" -source "$softwareRoot/Brave/install-extensions.sh" -source "$softwareRoot/Google Chrome/install.sh" +source "$softwareRoot/Brave/install-stable.sh"; +source "$softwareRoot/Brave/install-beta.sh"; +source "$softwareRoot/Brave/install-nightly.sh"; +source "$softwareRoot/Brave/install-extensions.sh"; +source "$softwareRoot/Google Chrome/install.sh"; # Install further software -source "$softwareRoot/logo-ls/install.sh" -source "$softwareRoot/VSCodium/install.sh" -source "$softwareRoot/Visual Studio Code/install.sh" -source "$softwareRoot/Node.js/install.sh" -source "$softwareRoot/Java/install.sh" -source "$softwareRoot/tea/install.sh" -source "$softwareRoot/Godot/install.sh" -source "$softwareRoot/Virtual Machine Manager/install.sh" -source "$softwareRoot/Woodpecker CLI/install.sh" +source "$softwareRoot/logo-ls/install.sh"; +source "$softwareRoot/VSCodium/install.sh"; +source "$softwareRoot/Visual Studio Code/install.sh"; +source "$softwareRoot/Node.js/install.sh"; +source "$softwareRoot/Java/install.sh"; +source "$softwareRoot/tea/install.sh"; +source "$softwareRoot/Godot/install.sh"; +source "$softwareRoot/Virtual Machine Manager/install.sh"; +source "$softwareRoot/Woodpecker CLI/install.sh"; # Install other flatpaks -flatpak install -y flathub com.bitwarden.desktop -flatpak install -y flathub com.github.xournalpp.xournalpp -flatpak install -y flathub org.signal.Signal -flatpak install -y flathub com.usebottles.bottles -flatpak install -y flathub com.mattjakeman.ExtensionManager -flatpak install -y flathub com.github.wwmm.easyeffects -flatpak install -y flathub ch.threema.threema-web-desktop -flatpak install -y flathub app.ytmdesktop.ytmdesktop -flatpak install -y flathub com.github.tchx84.Flatseal +flatpak install -y flathub com.bitwarden.desktop; +flatpak install -y flathub com.github.xournalpp.xournalpp; +flatpak install -y flathub org.signal.Signal; +flatpak install -y flathub com.usebottles.bottles; +flatpak install -y flathub com.mattjakeman.ExtensionManager; +flatpak install -y flathub com.github.wwmm.easyeffects; +flatpak install -y flathub ch.threema.threema-web-desktop; +flatpak install -y flathub app.ytmdesktop.ytmdesktop; +flatpak install -y flathub com.github.tchx84.Flatseal; # Microsoft Windows Fonts -source "$configRoot/Fonts/MicrosoftFonts/install.sh" +source "$configRoot/Fonts/MicrosoftFonts/install.sh"; # Install JetBrains Stuff -source "$softwareRoot/JetBrains/install-toolbox.sh" +source "$softwareRoot/JetBrains/install-toolbox.sh"; # Install equalizer -source "$configRoot/EasyEffects/SurfaceBook2/install.sh" +source "$configRoot/EasyEffects/SurfaceBook2/install.sh"; # Git config -git config --global user.name "Manuel Thalmann" -git config --global user.email "m@nuth.ch" +git config --global user.name "Manuel Thalmann"; +git config --global user.email "m@nuth.ch"; # Install General Packages from APT -source "$softwareRoot/common-apt/install.sh" +source "$softwareRoot/common-apt/install.sh"; # Troll Stuff -source "$configRoot/git/git-auf-deutsch/install.sh" +source "$configRoot/git/git-auf-deutsch/install.sh"; diff --git a/scripts/Config/EasyEffects/SurfaceBook2/install.sh b/scripts/Config/EasyEffects/SurfaceBook2/install.sh index 03f21e63..53a10b07 100755 --- a/scripts/Config/EasyEffects/SurfaceBook2/install.sh +++ b/scripts/Config/EasyEffects/SurfaceBook2/install.sh @@ -1,2 +1,2 @@ #!/bin/bash -cp ${BASH_SOURCE%/*}/*.json ~/.var/app/com.github.wwmm.easyeffects/config/easyeffects/output/ +cp ${BASH_SOURCE%/*}/*.json ~/.var/app/com.github.wwmm.easyeffects/config/easyeffects/output/; diff --git a/scripts/Config/Fonts/MicrosoftFonts/install.sh b/scripts/Config/Fonts/MicrosoftFonts/install.sh index 48178f4e..1e5efaa7 100755 --- a/scripts/Config/Fonts/MicrosoftFonts/install.sh +++ b/scripts/Config/Fonts/MicrosoftFonts/install.sh @@ -2,7 +2,7 @@ # Elevate script if [ ! "$UID" -eq 0 ] then - sudo bash "$BASH_SOURCE" "$USER" + sudo bash "$BASH_SOURCE" "$USER"; else apt install -y p7zip-full libgumbo-dev libfuse-dev libssl-dev libcurl4-openssl-dev uuid-dev; workingDirectory="$(pwd)"; @@ -24,7 +24,7 @@ else rm -f /usr/local/bin/httpdirfs; cd $tempDir; - wget -O CascadiaCode.zip https://github.com/microsoft/cascadia-code/releases/download/v2111.01/CascadiaCode-2111.01.zip + wget -O CascadiaCode.zip https://github.com/microsoft/cascadia-code/releases/download/v2111.01/CascadiaCode-2111.01.zip; unzip -d . CascadiaCode.zip; cp ttf/* /usr/share/fonts/TTF; diff --git a/scripts/Config/Fonts/NerdFont/install.sh b/scripts/Config/Fonts/NerdFont/install.sh index 469a6ccd..1bdff74f 100755 --- a/scripts/Config/Fonts/NerdFont/install.sh +++ b/scripts/Config/Fonts/NerdFont/install.sh @@ -2,13 +2,13 @@ # Elevate script if [ ! "$UID" -eq 0 ] then - sudo bash "$BASH_SOURCE" "$USER" + sudo bash "$BASH_SOURCE" "$USER"; else - homeDir=$(sudo -u $1 bash -c 'realpath ~') - fontFileBaseName="Caskaydia Cove Regular Nerd Font Complete.otf" - tempFile=$(sudo -u $1 mktemp -d)/$fontFileBaseName - destination=/usr/share/font/opentype + homeDir=$(sudo -u $1 bash -c 'realpath ~'); + fontFileBaseName="Caskaydia Cove Regular Nerd Font Complete.otf"; + tempFile=$(sudo -u $1 mktemp -d)/$fontFileBaseName; + destination=/usr/share/font/opentype; - sudo -u $1 cp "$homeDir/Nextcloud/Caskaydia Cove Regular Nerd Font Complete.otf" "$tempFile" - cp "$tempFile" /usr/share/fonts/opentype + sudo -u $1 cp "$homeDir/Nextcloud/Caskaydia Cove Regular Nerd Font Complete.otf" "$tempFile"; + cp "$tempFile" /usr/share/fonts/opentype; fi diff --git a/scripts/Config/GnomeExtensions/install.sh b/scripts/Config/GnomeExtensions/install.sh index e8b2afff..0b28e6b9 100755 --- a/scripts/Config/GnomeExtensions/install.sh +++ b/scripts/Config/GnomeExtensions/install.sh @@ -1,34 +1,34 @@ #!/bin/bash -commandName=gnome-shell-extension-installer -extensionLocation=/usr/share/gnome-shell/extensions -workingDirectory=$(pwd) -contextRoot=$(mktemp -d) -cd "$contextRoot" -sudo apt install -y jq +commandName=gnome-shell-extension-installer; +extensionLocation=/usr/share/gnome-shell/extensions; +workingDirectory=$(pwd); +contextRoot=$(mktemp -d); +cd "$contextRoot"; +sudo apt install -y jq; -wget -O "$commandName" "https://github.com/brunelli/gnome-shell-extension-installer/raw/master/gnome-shell-extension-installer" -sudo install "$commandName" /usr/local/bin +wget -O "$commandName" "https://github.com/brunelli/gnome-shell-extension-installer/raw/master/gnome-shell-extension-installer"; +sudo install "$commandName" /usr/local/bin; -cd "$workingDirectory" -rm -rf "$contextRoot" +cd "$workingDirectory"; +rm -rf "$contextRoot"; for id in 779 4907 1162 do - workingDirectory=$(pwd) - contextRoot=$(mktemp -d) - unzipLocation=$(mktemp -d) - cd "$contextRoot" + workingDirectory=$(pwd); + contextRoot=$(mktemp -d); + unzipLocation=$(mktemp -d); + cd "$contextRoot"; - gnome-shell-extension-installer $id --no-install - sudo gnome-shell-extension-installer $id --yes - unzip ./*.zip -d "$unzipLocation" - uuid=$(jq -r '.uuid' "$unzipLocation/metadata.json") + gnome-shell-extension-installer $id --no-install; + sudo gnome-shell-extension-installer $id --yes; + unzip ./*.zip -d "$unzipLocation"; + uuid=$(jq -r '.uuid' "$unzipLocation/metadata.json"); - sudo chmod -R +r "$extensionLocation/$uuid" - gnome-extensions enable "$uuid" + sudo chmod -R +r "$extensionLocation/$uuid"; + gnome-extensions enable "$uuid"; - cd "$workingDirectory" - rm -rf "$contextRoot" + cd "$workingDirectory"; + rm -rf "$contextRoot"; done -killall -SIGQUIT gnome-shell +killall -SIGQUIT gnome-shell; diff --git a/scripts/Config/git/git-auf-deutsch/install.sh b/scripts/Config/git/git-auf-deutsch/install.sh index fce3a48e..d81131dd 100755 --- a/scripts/Config/git/git-auf-deutsch/install.sh +++ b/scripts/Config/git/git-auf-deutsch/install.sh @@ -1,34 +1,34 @@ #!/bin/bash -git config --global alias.ahfange init -git config --global alias.tuedezue add -git config --global alias.beschuldig blame -git config --global alias.zieh pull -git config --global alias.druck push -git config --global alias.machnah clone -git config --global alias.hol fetch -git config --global alias.zwiigab branch -git config --global alias.buechiih commit -git config --global alias.eich rebase -git config --global alias.erd rebase -git config --global alias.gahufwiifelde rebase -git config --global alias.vergliich diff -git config --global alias.tuezemme merge -git config --global alias.versorg stash -git config --global alias.markier tag -git config --global alias.pflueckoepfel cherry-pick -git config --global alias.pflueckhimbeeri cherry-pick -git config --global alias.buechuus checkout -git config --global alias.quaetsch 'merge --squash' -git config --global alias.pfudle 'push --force' -git config --global alias.beschuldigung blame -git config --global alias.zwiigli branch -git config --global alias.tagebuech log -git config --global alias.versteck stash -git config --global alias.zuestand status -git config --global alias.markierig tag +git config --global alias.ahfange init; +git config --global alias.tuedezue add; +git config --global alias.beschuldig blame; +git config --global alias.zieh pull; +git config --global alias.druck push; +git config --global alias.machnah clone; +git config --global alias.hol fetch; +git config --global alias.zwiigab branch; +git config --global alias.buechiih commit; +git config --global alias.eich rebase; +git config --global alias.erd rebase; +git config --global alias.gahufwiifelde rebase; +git config --global alias.vergliich diff; +git config --global alias.tuezemme merge; +git config --global alias.versorg stash; +git config --global alias.markier tag; +git config --global alias.pflueckoepfel cherry-pick; +git config --global alias.pflueckhimbeeri cherry-pick; +git config --global alias.buechuus checkout; +git config --global alias.quaetsch 'merge --squash'; +git config --global alias.pfudle 'push --force'; +git config --global alias.beschuldigung blame; +git config --global alias.zwiigli branch; +git config --global alias.tagebuech log; +git config --global alias.versteck stash; +git config --global alias.zuestand status; +git config --global alias.markierig tag; { - echo "" - echo "# Git auf Thurgauerisch" - echo "alias totsch='git'" -} >> ~/.bashrc + echo ""; + echo "# Git auf Thurgauerisch"; + echo "alias totsch='git'"; +} >> ~/.bashrc; diff --git a/scripts/Config/rclone/InstallSync.sh b/scripts/Config/rclone/InstallSync.sh index 1bcff6bc..7987cfad 100755 --- a/scripts/Config/rclone/InstallSync.sh +++ b/scripts/Config/rclone/InstallSync.sh @@ -8,6 +8,6 @@ rclone config; mkdir -p ~/$dirname; -systemctl --user enable $serviceName -systemctl --user daemon-reload -systemctl --user start $serviceName +systemctl --user enable $serviceName; +systemctl --user daemon-reload; +systemctl --user start $serviceName; diff --git a/scripts/Devices/Surface/LinuxSurface/install.sh b/scripts/Devices/Surface/LinuxSurface/install.sh index 059af10b..c7807df4 100755 --- a/scripts/Devices/Surface/LinuxSurface/install.sh +++ b/scripts/Devices/Surface/LinuxSurface/install.sh @@ -2,21 +2,21 @@ # Elevate script if [ ! "$UID" -eq 0 ] then - sudo bash "$BASH_SOURCE" + sudo bash "$BASH_SOURCE"; else wget -qO - https://raw.githubusercontent.com/linux-surface/linux-surface/master/pkg/keys/surface.asc \ - | gpg --dearmor | sudo dd of=/etc/apt/trusted.gpg.d/linux-surface.gpg + | gpg --dearmor | sudo dd of=/etc/apt/trusted.gpg.d/linux-surface.gpg; echo "deb [arch=amd64] https://pkg.surfacelinux.com/debian release main" \ - | sudo tee /etc/apt/sources.list.d/linux-surface.list + | sudo tee /etc/apt/sources.list.d/linux-surface.list; - apt update - apt install -y linux-image-surface linux-headers-surface iptsd libwacom-surface - systemctl enable iptsd + apt update; + apt install -y linux-image-surface linux-headers-surface iptsd libwacom-surface; + systemctl enable iptsd; # Install DTX - package=$(mktemp) - wget https://github.com/linux-surface/surface-dtx-daemon/releases/download/v0.3.3-2/surface-dtx-daemon_0.3.3-2_amd64.deb -O $package - dpkg -i $package - rm -f $package + package=$(mktemp); + wget https://github.com/linux-surface/surface-dtx-daemon/releases/download/v0.3.3-2/surface-dtx-daemon_0.3.3-2_amd64.deb -O $package; + dpkg -i $package; + rm -f $package; fi diff --git a/scripts/Devices/SurfaceBook2/Camera/install.sh b/scripts/Devices/SurfaceBook2/Camera/install.sh index a9d90553..55f4ba7e 100755 --- a/scripts/Devices/SurfaceBook2/Camera/install.sh +++ b/scripts/Devices/SurfaceBook2/Camera/install.sh @@ -1,19 +1,19 @@ -workingDirectory="$(pwd)" -contextRoot="$(mktemp -d)" -cd "$contextRoot" +workingDirectory="$(pwd)"; +contextRoot="$(mktemp -d)"; +cd "$contextRoot"; sudo apt install -y \ build-essential meson ninja-build pkg-config libgnutls28-dev openssl \ python3-pip python3-yaml python3-ply python3-jinja2 \ qtbase5-dev libqt5core5a libqt5gui5 libqt5widgets5 qttools5-dev-tools \ libtiff-dev libevent-dev libyaml-dev \ - gstreamer1.0-tools libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev + gstreamer1.0-tools libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev; -git clone https://git.libcamera.org/libcamera/libcamera.git -cd libcamera -meson build -Dpipelines=uvcvideo,vimc,ipu3 -Dipas=vimc,ipu3 -Dprefix=/usr -Dgstreamer=enabled -ninja -C build -sudo ninja -C build install +git clone https://git.libcamera.org/libcamera/libcamera.git; +cd libcamera; +meson build -Dpipelines=uvcvideo,vimc,ipu3 -Dipas=vimc,ipu3 -Dprefix=/usr -Dgstreamer=enabled; +ninja -C build; +sudo ninja -C build install; -cd "$workingDirectory" -rm -rf "$contextRoot" +cd "$workingDirectory"; +rm -rf "$contextRoot"; diff --git a/scripts/Devices/SurfaceBook2/SecureBoot/install.sh b/scripts/Devices/SurfaceBook2/SecureBoot/install.sh index b0a685ec..619613fd 100755 --- a/scripts/Devices/SurfaceBook2/SecureBoot/install.sh +++ b/scripts/Devices/SurfaceBook2/SecureBoot/install.sh @@ -1,94 +1,94 @@ #!/bin/bash -scriptRoot=$(realpath "${BASH_SOURCE%/*}") +scriptRoot=$(realpath "${BASH_SOURCE%/*}"); # Elevate script if [ ! "$UID" -eq 0 ] then - sudo bash "$BASH_SOURCE" - bash "$scriptRoot/sign-modules.sh" + sudo bash "$BASH_SOURCE"; + bash "$scriptRoot/sign-modules.sh"; else # Create context directory - workingDirectory="$(pwd)" - contextRoot="$(mktemp -d)" - packageName="shim.rpm" - cd "$contextRoot" + workingDirectory="$(pwd)"; + contextRoot="$(mktemp -d)"; + packageName="shim.rpm"; + cd "$contextRoot"; # Install Prerequisites - apt install -y wget rpm2cpio efitools + apt install -y wget rpm2cpio efitools; # Download and Extract Package - wget https://kojipkgs.fedoraproject.org/packages/shim/15.6/2/x86_64/shim-x64-15.6-2.x86_64.rpm -O "$packageName" - rpm2archive "$packageName" - tar -xvzf "$packageName.tgz" - rm -f "$packageName" "$packageName.tgz" + wget https://kojipkgs.fedoraproject.org/packages/shim/15.6/2/x86_64/shim-x64-15.6-2.x86_64.rpm -O "$packageName"; + rpm2archive "$packageName"; + tar -xvzf "$packageName.tgz"; + rm -f "$packageName" "$packageName.tgz"; # Initialize variables - src="./boot/efi/EFI/fedora" - esp=/boot/efi - defaultBootDir=$esp/EFI/BOOT - microsoftBootDir=$esp/EFI/Microsoft/Boot + src="./boot/efi/EFI/fedora"; + esp=/boot/efi; + defaultBootDir=$esp/EFI/BOOT; + microsoftBootDir=$esp/EFI/Microsoft/Boot; - systemdDirName=/EFI/systemd - systemdFullName=$esp$systemdDirName - systemdFile=$systemdFullName/systemd-bootx64.efi - bootFile=$defaultBootDir/grubx64.efi + systemdDirName=/EFI/systemd; + systemdFullName=$esp$systemdDirName; + systemdFile=$systemdFullName/systemd-bootx64.efi; + bootFile=$defaultBootDir/grubx64.efi; # Set up files - cp $systemdFile $bootFile - cp "$src/shimx64.efi" $defaultBootDir/BOOTx64.efi - cp "$src/mmx64.efi" $defaultBootDir - cp /usr/lib/efitools/x86_64-linux-gnu/KeyTool.efi /boot/efi/EFI/systemd/ - wget https://github.com/tianocore/edk2-archive/raw/master/ShellBinPkg/UefiShell/X64/Shell.efi -O "$systemdFullName/Shell.efi" + cp $systemdFile $bootFile; + cp "$src/shimx64.efi" $defaultBootDir/BOOTx64.efi; + cp "$src/mmx64.efi" $defaultBootDir; + cp /usr/lib/efitools/x86_64-linux-gnu/KeyTool.efi /boot/efi/EFI/systemd/; + wget https://github.com/tianocore/edk2-archive/raw/master/ShellBinPkg/UefiShell/X64/Shell.efi -O "$systemdFullName/Shell.efi"; { - echo "sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md" - echo "systemd-boot,1,systemd,systemd-boot,1,https://systemd.io" - } > sbat.csv + echo "sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md"; + echo "systemd-boot,1,systemd,systemd-boot,1,https://systemd.io"; + } > sbat.csv; # No idea where the `10000000` comes from... # Taken from https://github.com/rhboot/shim/issues/376#issuecomment-964137621 - objcopy --set-section-alignment '.sbat=512' --add-section .sbat=sbat.csv --change-section-address .sbat+10000000 "$bootFile" + objcopy --set-section-alignment '.sbat=512' --add-section .sbat=sbat.csv --change-section-address .sbat+10000000 "$bootFile"; # Add boot entries - efibootmgr --unicode --disk /dev/nvme0n1 --part 0 --create --label "Shim" --loader /EFI/BOOT/BOOTx64.efi + efibootmgr --unicode --disk /dev/nvme0n1 --part 0 --create --label "Shim" --loader /EFI/BOOT/BOOTx64.efi; # Configure systemd-boot { - echo "timeout 4" - } >> /boot/efi/loader/loader.conf + echo "timeout 4"; + } >> /boot/efi/loader/loader.conf; { - echo "title MokManager" - echo "efi /EFI/BOOT/mmx64.efi" - } > /boot/efi/loader/entries/MokManager.conf + echo "title MokManager"; + echo "efi /EFI/BOOT/mmx64.efi"; + } > /boot/efi/loader/entries/MokManager.conf; { - echo "title KeyTool" - echo "efi /EFI/systemd/KeyTool.efi" - } > /boot/efi/loader/entries/KeyTool.conf + echo "title KeyTool"; + echo "efi /EFI/systemd/KeyTool.efi"; + } > /boot/efi/loader/entries/KeyTool.conf; { - echo "title UEFI Shell" - echo "efi /EFI/systemd/Shell.efi" - } > /boot/efi/loader/entries/Shell.conf + echo "title UEFI Shell"; + echo "efi /EFI/systemd/Shell.efi"; + } > /boot/efi/loader/entries/Shell.conf: # Install surface MOK - apt install -y linux-surface-secureboot-mok + apt install -y linux-surface-secureboot-mok; # Install MOK Key - keyDir="/var/lib/shim-signed/mok" - mkdir -p "$keyDir" - cp "$scriptRoot/openssl.cnf" "$keyDir/openssl.cnf" + keyDir="/var/lib/shim-signed/mok"; + mkdir -p "$keyDir"; + cp "$scriptRoot/openssl.cnf" "$keyDir/openssl.cnf"; openssl req -config "$keyDir/openssl.cnf" \ -new -x509 -newkey rsa:2048 \ -nodes -days 36500 -outform DER \ -keyout "$keyDir/MOK.priv" \ - -out "$keyDir/MOK.der" + -out "$keyDir/MOK.der"; - mokutil --import "$keyDir/MOK.der" + mokutil --import "$keyDir/MOK.der"; # Remove context directory - cd $workingDirectory - rm -rf $contextRoot + cd $workingDirectory; + rm -rf $contextRoot; fi diff --git a/scripts/Devices/SurfaceBook2/SecureBoot/sign-modules.sh b/scripts/Devices/SurfaceBook2/SecureBoot/sign-modules.sh index 003db294..f1a67a90 100755 --- a/scripts/Devices/SurfaceBook2/SecureBoot/sign-modules.sh +++ b/scripts/Devices/SurfaceBook2/SecureBoot/sign-modules.sh @@ -2,14 +2,14 @@ # Elevate script if [ ! "$UID" -eq 0 ] then - sudo bash "$BASH_SOURCE" + sudo bash "$BASH_SOURCE"; else - keyDir="/var/lib/shim-signed/mok" - keyFile="$keyDir/MOK.priv" - pubFile="$keyDir/MOK.der" + keyDir="/var/lib/shim-signed/mok"; + keyFile="$keyDir/MOK.priv"; + pubFile="$keyDir/MOK.der"; for file in $(find /lib/modules /var/lib/dkms -name *.ko); do - kmodsign sha512 $keyFile $pubFile $file + kmodsign sha512 $keyFile $pubFile $file; done fi diff --git a/scripts/Software/Brave/install-beta.sh b/scripts/Software/Brave/install-beta.sh index 5ad3982a..fd6c5ed5 100755 --- a/scripts/Software/Brave/install-beta.sh +++ b/scripts/Software/Brave/install-beta.sh @@ -2,18 +2,18 @@ # Elevate script if [ ! "$UID" -eq 0 ] then - sudo bash "$BASH_SOURCE" + sudo bash "$BASH_SOURCE"; else # Prepare - apt install -y wget unzip jq apt-transport-https curl - curl -fsSLo /usr/share/keyrings/brave-browser-beta-archive-keyring.gpg https://brave-browser-apt-beta.s3.brave.com/brave-browser-beta-archive-keyring.gpg + apt install -y wget unzip jq apt-transport-https curl; + curl -fsSLo /usr/share/keyrings/brave-browser-beta-archive-keyring.gpg https://brave-browser-apt-beta.s3.brave.com/brave-browser-beta-archive-keyring.gpg; echo "deb [signed-by=/usr/share/keyrings/brave-browser-beta-archive-keyring.gpg arch=amd64] https://brave-browser-apt-beta.s3.brave.com/ stable main" \ - | sudo tee /etc/apt/sources.list.d/brave-browser-beta.list + | sudo tee /etc/apt/sources.list.d/brave-browser-beta.list; # Install Brave Beta - apt update - apt install -y brave-browser-beta + apt update; + apt install -y brave-browser-beta; # Add pre-installed extensions - sudo ln -s /opt/brave.com/brave/extensions /opt/brave.com/brave-beta/extensions + sudo ln -s /opt/brave.com/brave/extensions /opt/brave.com/brave-beta/extensions; fi diff --git a/scripts/Software/Brave/install-extensions.sh b/scripts/Software/Brave/install-extensions.sh index 37e45795..707ccd31 100755 --- a/scripts/Software/Brave/install-extensions.sh +++ b/scripts/Software/Brave/install-extensions.sh @@ -2,49 +2,49 @@ # Elevate script if [ ! "$UID" -eq 0 ] then - sudo bash "$BASH_SOURCE" "$USER" + sudo bash "$BASH_SOURCE" "$USER"; else # Download and extract `youtube-music-dl` - archiveName=$(sudo -u $1 mktemp) - sudo -u $1 wget https://github.com/dougppaz/youtube-music-dl/releases/download/v1.2.1/youtube-music-dl.zip -O $archiveName - extensionName=youtube-music-dl + archiveName=$(sudo -u $1 mktemp); + sudo -u $1 wget https://github.com/dougppaz/youtube-music-dl/releases/download/v1.2.1/youtube-music-dl.zip -O $archiveName; + extensionName=youtube-music-dl; - contextRoot=$(sudo -u $1 mktemp -d) - extensionDir=$contextRoot/$extensionName - keyFile=$extensionDir.pem - extensionFile=$extensionDir.crx - manifestFile=$extensionDir/manifest.json + contextRoot=$(sudo -u $1 mktemp -d); + extensionDir=$contextRoot/$extensionName; + keyFile=$extensionDir.pem; + extensionFile=$extensionDir.crx; + manifestFile=$extensionDir/manifest.json; - extensionRoot=/usr/share/brave-extensions - destination=$extensionRoot/$extensionName.crx + extensionRoot=/usr/share/brave-extensions; + destination=$extensionRoot/$extensionName.crx; # Prepare extension - mkdir -p $extensionRoot - sudo -u $1 unzip $archiveName -d $extensionDir - sudo -u $1 brave-browser --pack-extension=$extensionDir - rm $archiveName + mkdir -p $extensionRoot; + sudo -u $1 unzip $archiveName -d $extensionDir; + sudo -u $1 brave-browser --pack-extension=$extensionDir; + rm $archiveName; # Tamper manifest file - manifest="$(cat $manifestFile | jq ". + {key: "'"'"$(openssl rsa -in $keyFile -pubout -outform DER | openssl base64 -A)"'"'"}")" - manifest="$(echo $manifest | jq ".background.persistent = false")" - echo $manifest | sudo -u $1 tee $manifestFile + manifest="$(cat $manifestFile | jq ". + {key: "'"'"$(openssl rsa -in $keyFile -pubout -outform DER | openssl base64 -A)"'"'"}")"; + manifest="$(echo $manifest | jq ".background.persistent = false")"; + echo $manifest | sudo -u $1 tee $manifestFile; # Pack extension - extensionID=$(openssl rsa -in $keyFile -pubout -outform DER | sha256sum | head -c32 | tr 0-9a-f a-p) - extensionVersion=$(cat $manifestFile | jq -r '.version') - sudo -u $1 brave-browser --pack-extension=$extensionDir --pack-extension-key=$keyFile + extensionID=$(openssl rsa -in $keyFile -pubout -outform DER | sha256sum | head -c32 | tr 0-9a-f a-p); + extensionVersion=$(cat $manifestFile | jq -r '.version'); + sudo -u $1 brave-browser --pack-extension=$extensionDir --pack-extension-key=$keyFile; # Install extension and preinstall it - cp $extensionFile $extensionRoot - configRoot=/opt/brave.com/brave/extensions/ - rm -rf $contextRoot - chmod -R a+rx $extensionRoot - chmod -R u+w $extensionRoot - mkdir -p $configRoot + cp $extensionFile $extensionRoot; + configRoot=/opt/brave.com/brave/extensions/; + rm -rf $contextRoot; + chmod -R a+rx $extensionRoot; + chmod -R u+w $extensionRoot; + mkdir -p $configRoot; { - echo "{" - echo ' "external_crx": "'"$destination"'",' - echo ' "external_version": "'"$extensionVersion"'"' - echo "}" - } | tee $configRoot/$extensionID.json + echo "{"; + echo ' "external_crx": "'"$destination"'",'; + echo ' "external_version": "'"$extensionVersion"'"'; + echo "}"; + } | tee $configRoot/$extensionID.json; fi diff --git a/scripts/Software/Brave/install-nightly.sh b/scripts/Software/Brave/install-nightly.sh index c5b4942e..3df1f08b 100755 --- a/scripts/Software/Brave/install-nightly.sh +++ b/scripts/Software/Brave/install-nightly.sh @@ -2,18 +2,18 @@ # Elevate script if [ ! "$UID" -eq 0 ] then - sudo bash "$BASH_SOURCE" + sudo bash "$BASH_SOURCE"; else # Prepare - apt install -y wget unzip jq apt-transport-https curl - curl -fsSLo /usr/share/keyrings/brave-browser-nightly-archive-keyring.gpg https://brave-browser-apt-nightly.s3.brave.com/brave-browser-nightly-archive-keyring.gpg + apt install -y wget unzip jq apt-transport-https curl; + curl -fsSLo /usr/share/keyrings/brave-browser-nightly-archive-keyring.gpg https://brave-browser-apt-nightly.s3.brave.com/brave-browser-nightly-archive-keyring.gpg; echo "deb [signed-by=/usr/share/keyrings/brave-browser-nightly-archive-keyring.gpg arch=amd64] https://brave-browser-apt-nightly.s3.brave.com/ stable main" \ - | sudo tee /etc/apt/sources.list.d/brave-browser-nightly.list + | sudo tee /etc/apt/sources.list.d/brave-browser-nightly.list; # Install Brave Nightly - apt update - apt install -y brave-browser-nightly + apt update; + apt install -y brave-browser-nightly; # Add pre-installed extensions - sudo ln -s /opt/brave.com/brave/extensions /opt/brave.com/brave-nightly/extensions + sudo ln -s /opt/brave.com/brave/extensions /opt/brave.com/brave-nightly/extensions; fi diff --git a/scripts/Software/Brave/install-stable.sh b/scripts/Software/Brave/install-stable.sh index eca0de97..257a2fb8 100755 --- a/scripts/Software/Brave/install-stable.sh +++ b/scripts/Software/Brave/install-stable.sh @@ -2,15 +2,15 @@ # Elevate script if [ ! "$UID" -eq 0 ] then - sudo bash "$BASH_SOURCE" + sudo bash "$BASH_SOURCE"; else # Prepare - apt install -y wget unzip jq apt-transport-https curl - curl -fsSLo /usr/share/keyrings/brave-browser-archive-keyring.gpg https://brave-browser-apt-release.s3.brave.com/brave-browser-archive-keyring.gpg + apt install -y wget unzip jq apt-transport-https curl; + curl -fsSLo /usr/share/keyrings/brave-browser-archive-keyring.gpg https://brave-browser-apt-release.s3.brave.com/brave-browser-archive-keyring.gpg; echo "deb [signed-by=/usr/share/keyrings/brave-browser-archive-keyring.gpg arch=amd64] https://brave-browser-apt-release.s3.brave.com/ stable main" \ - | tee /etc/apt/sources.list.d/brave-browser-release.list + | tee /etc/apt/sources.list.d/brave-browser-release.list; # Install Brave - apt update - apt install -y brave-browser + apt update; + apt install -y brave-browser; fi diff --git a/scripts/Software/Godot/install.sh b/scripts/Software/Godot/install.sh index 078145fd..32eb0a13 100755 --- a/scripts/Software/Godot/install.sh +++ b/scripts/Software/Godot/install.sh @@ -2,35 +2,35 @@ # Elevate script if [ ! "$UID" -eq 0 ] then - sudo bash "$BASH_SOURCE" "$USER" + sudo bash "$BASH_SOURCE" "$USER"; else - tempDir="$(mktemp -d)" - archiveName="$(mktemp)" - destination="/var/lib/godot" + tempDir="$(mktemp -d)"; + archiveName="$(mktemp)"; + destination="/var/lib/godot"; if [ -d "$destination" ]; then - rm -rf "$destination" + rm -rf "$destination"; fi - wget https://github.com/godotengine/godot/releases/download/3.5.1-stable/Godot_v3.5.1-stable_mono_x11_64.zip -O "$archiveName" - unzip "$archiveName" -d "$tempDir" - mkdir -p "$destination" - mv "$tempDir"/*/* "$destination" - wget https://github.com/godotengine/godot/raw/3.5.1-stable/icon.svg -O "$destination/icon.svg" + wget https://github.com/godotengine/godot/releases/download/3.5.1-stable/Godot_v3.5.1-stable_mono_x11_64.zip -O "$archiveName"; + unzip "$archiveName" -d "$tempDir"; + mkdir -p "$destination"; + mv "$tempDir"/*/* "$destination"; + wget https://github.com/godotengine/godot/raw/3.5.1-stable/icon.svg -O "$destination/icon.svg"; - rm -rf "$tempDir" - rm -f "$archiveName" + rm -rf "$tempDir"; + rm -f "$archiveName"; - exeFile="$(find "$destination" -maxdepth 1 -perm -111 -type f)" - ln -s "$exeFile" /usr/local/bin/godot + exeFile="$(find "$destination" -maxdepth 1 -perm -111 -type f)"; + ln -s "$exeFile" /usr/local/bin/godot; { - echo "[Desktop Entry]" - echo "Encoding=UTF-8" - echo "Type=Application" - echo "Terminal=false" - echo "Exec=$exeFile" - echo "Name=Godot Engine" - echo "Icon=$destination/icon.svg" - } > /usr/share/applications/godot.desktop + echo "[Desktop Entry]"; + echo "Encoding=UTF-8"; + echo "Type=Application"; + echo "Terminal=false"; + echo "Exec=$exeFile"; + echo "Name=Godot Engine"; + echo "Icon=$destination/icon.svg"; + } > /usr/share/applications/godot.desktop; fi diff --git a/scripts/Software/Google Chrome/install.sh b/scripts/Software/Google Chrome/install.sh index ff965fe8..15b43a5e 100755 --- a/scripts/Software/Google Chrome/install.sh +++ b/scripts/Software/Google Chrome/install.sh @@ -2,14 +2,14 @@ # Elevate script if [ ! "$UID" -eq 0 ] then - sudo bash "$BASH_SOURCE" + sudo bash "$BASH_SOURCE"; else - wget https://dl-ssl.google.com/linux/linux_signing_key.pub -O /tmp/google.pub - gpg --no-default-keyring --keyring /etc/apt/keyrings/google-chrome.gpg --import /tmp/google.pub + wget https://dl-ssl.google.com/linux/linux_signing_key.pub -O /tmp/google.pub; + gpg --no-default-keyring --keyring /etc/apt/keyrings/google-chrome.gpg --import /tmp/google.pub; echo 'deb [arch=amd64 signed-by=/etc/apt/keyrings/google-chrome.gpg] http://dl.google.com/linux/chrome/deb/ stable main' \ - | sudo tee /etc/apt/sources.list.d/google-chrome.list + | sudo tee /etc/apt/sources.list.d/google-chrome.list; - apt update - apt install -y google-chrome-stable + apt update; + apt install -y google-chrome-stable; fi diff --git a/scripts/Software/Java/install.sh b/scripts/Software/Java/install.sh index 45e5738f..c89eed2b 100755 --- a/scripts/Software/Java/install.sh +++ b/scripts/Software/Java/install.sh @@ -2,20 +2,20 @@ # Elevate script if [ ! "$UID" -eq 0 ] then - sudo bash "$BASH_SOURCE" - curl -s "https://get.sdkman.io" | bash - source "$HOME/.sdkman/bin/sdkman-init.sh" - sdk install gradle 7.5.1 + sudo bash "$BASH_SOURCE"; + curl -s "https://get.sdkman.io" | bash; + source "$HOME/.sdkman/bin/sdkman-init.sh"; + sdk install gradle 7.5.1; else - apt install -y wget apt-transport-https - mkdir -p /etc/apt/keyrings + apt install -y wget apt-transport-https; + mkdir -p /etc/apt/keyrings; wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public \ - | tee /etc/apt/keyrings/adoptium.asc + | tee /etc/apt/keyrings/adoptium.asc; echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" \ - | tee /etc/apt/sources.list.d/adoptium.list + | tee /etc/apt/sources.list.d/adoptium.list; - apt update - apt install -y temurin-17-jdk + apt update; + apt install -y temurin-17-jdk; fi diff --git a/scripts/Software/JetBrains/install-toolbox.sh b/scripts/Software/JetBrains/install-toolbox.sh index 3f2fb5ea..945eafc7 100755 --- a/scripts/Software/JetBrains/install-toolbox.sh +++ b/scripts/Software/JetBrains/install-toolbox.sh @@ -2,24 +2,24 @@ # Elevate script if [ ! "$UID" -eq 0 ] then - sudo bash "$BASH_SOURCE" + sudo bash "$BASH_SOURCE"; else - workingDirectory=$(pwd) - contextRoot=$(mktemp -d) - cd $contextRoot + workingDirectory=$(pwd); + contextRoot=$(mktemp -d); + cd $contextRoot; curl -fsSL https://raw.githubusercontent.com/nagygergo/jetbrains-toolbox-install/1.1/jetbrains-toolbox.sh \ - | bash + | bash; - cd $workingDirectory - rm -rf $contextRoot + cd $workingDirectory; + rm -rf $contextRoot; { - echo "[Desktop Entry]" - echo "Encoding=UTF-8" - echo "Type=Application" - echo "Terminal=false" - echo "Exec=/opt/jetbrains-toolbox/jetbrains-toolbox" - echo "Name=JetBrains Toolbox" - } > /usr/share/applications/jetbrains-toolbox.desktop + echo "[Desktop Entry]"; + echo "Encoding=UTF-8"; + echo "Type=Application"; + echo "Terminal=false"; + echo "Exec=/opt/jetbrains-toolbox/jetbrains-toolbox"; + echo "Name=JetBrains Toolbox"; + } > /usr/share/applications/jetbrains-toolbox.desktop; fi diff --git a/scripts/Software/Node.js/install.sh b/scripts/Software/Node.js/install.sh index 5bfb860a..5e1a6bc2 100755 --- a/scripts/Software/Node.js/install.sh +++ b/scripts/Software/Node.js/install.sh @@ -1,4 +1,4 @@ #!/bin/bash -export NVS_HOME="$HOME/.nvs" -git clone https://github.com/jasongin/nvs "$NVS_HOME" -. "$NVS_HOME/nvs.sh" install +export NVS_HOME="$HOME/.nvs"; +git clone https://github.com/jasongin/nvs "$NVS_HOME"; +. "$NVS_HOME/nvs.sh" install; diff --git a/scripts/Software/Oh My Posh/install.sh b/scripts/Software/Oh My Posh/install.sh index 9352f309..237f0b18 100755 --- a/scripts/Software/Oh My Posh/install.sh +++ b/scripts/Software/Oh My Posh/install.sh @@ -2,24 +2,24 @@ # Elevate script if [ ! "$UID" -eq 0 ] then - sudo bash "$BASH_SOURCE" "$USER" + sudo bash "$BASH_SOURCE" "$USER"; else - bin=oh-my-posh - workingDirectory=$(pwd) - contextRoot=$(mktemp -d) - cd $contextRoot + bin=oh-my-posh; + workingDirectory=$(pwd); + contextRoot=$(mktemp -d); + cd $contextRoot; - wget https://github.com/JanDeDobbeleer/oh-my-posh/releases/latest/download/posh-linux-amd64 -O $bin - install $bin /usr/local/bin + wget https://github.com/JanDeDobbeleer/oh-my-posh/releases/latest/download/posh-linux-amd64 -O $bin; + install $bin /usr/local/bin; - cd $workingDirectory - rm -rf $contextRoot + cd $workingDirectory; + rm -rf $contextRoot; - homeDir=$(sudo -u $1 bash -c 'realpath ~') + homeDir=$(sudo -u $1 bash -c 'realpath ~'); - sudo -u $1 mkdir -p $homeDir/.omp - sudo -u $1 cp $homeDir/Nextcloud/.omp/manuel.omp.json $homeDir/.omp/manuel.omp.json + sudo -u $1 mkdir -p $homeDir/.omp; + sudo -u $1 cp $homeDir/Nextcloud/.omp/manuel.omp.json $homeDir/.omp/manuel.omp.json; echo 'eval "$(oh-my-posh init bash --config ~/.omp/manuel.omp.json)"' \ - | sudo -u $1 tee -a $homeDir/.bashrc + | sudo -u $1 tee -a $homeDir/.bashrc; fi diff --git a/scripts/Software/Python/pyenv.sh b/scripts/Software/Python/pyenv.sh index 11e251ab..abf2c1fd 100755 --- a/scripts/Software/Python/pyenv.sh +++ b/scripts/Software/Python/pyenv.sh @@ -1,10 +1,10 @@ #!/bin/bash -curl https://pyenv.run | bash +curl https://pyenv.run | bash; { - echo "" - echo "# pyenv" - echo 'export PYENV_ROOT="$HOME/.pyenv"' - echo 'command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"' - echo 'eval "$(pyenv init -)"' - echo 'eval "$(pyenv virtualenv-init -)"' -} >> ~/.bashrc + echo ""; + echo "# pyenv"; + echo 'export PYENV_ROOT="$HOME/.pyenv"'; + echo 'command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"'; + echo 'eval "$(pyenv init -)"'; + echo 'eval "$(pyenv virtualenv-init -)"'; +} >> ~/.bashrc; diff --git a/scripts/Software/Python/setup.sh b/scripts/Software/Python/setup.sh index 5a59fb13..f464da87 100755 --- a/scripts/Software/Python/setup.sh +++ b/scripts/Software/Python/setup.sh @@ -2,8 +2,8 @@ # Elevate script if [ ! "$UID" -eq 0 ] then - sudo bash "$BASH_SOURCE" + sudo bash "$BASH_SOURCE"; else - apt install -y python3 python-is-python3 python3-pip - pip install pipenv + apt install -y python3 python-is-python3 python3-pip; + pip install pipenv; fi diff --git a/scripts/Software/VSCodium/install.sh b/scripts/Software/VSCodium/install.sh index 2d7de0bd..fd141fa9 100755 --- a/scripts/Software/VSCodium/install.sh +++ b/scripts/Software/VSCodium/install.sh @@ -2,15 +2,15 @@ # Elevate script if [ ! "$UID" -eq 0 ] then - sudo bash "$BASH_SOURCE" + sudo bash "$BASH_SOURCE"; else wget -qO - https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/raw/master/pub.gpg \ | gpg --dearmor \ - | dd of=/usr/share/keyrings/vscodium-archive-keyring.gpg + | dd of=/usr/share/keyrings/vscodium-archive-keyring.gpg; echo 'deb [ signed-by=/usr/share/keyrings/vscodium-archive-keyring.gpg ] https://download.vscodium.com/debs vscodium main' \ - | tee /etc/apt/sources.list.d/vscodium.list + | tee /etc/apt/sources.list.d/vscodium.list; - apt update - apt install -y codium + apt update; + apt install -y codium; fi diff --git a/scripts/Software/Virtual Machine Manager/install.sh b/scripts/Software/Virtual Machine Manager/install.sh index bd613097..2d27930f 100755 --- a/scripts/Software/Virtual Machine Manager/install.sh +++ b/scripts/Software/Virtual Machine Manager/install.sh @@ -1,2 +1,2 @@ #!/bin/bash -sudo apt install -y swtpm swtpm-tools libvirt-daemon-system virt-manager +sudo apt install -y swtpm swtpm-tools libvirt-daemon-system virt-manager; diff --git a/scripts/Software/Visual Studio Code/install.sh b/scripts/Software/Visual Studio Code/install.sh index 7992dab9..a0203e1e 100755 --- a/scripts/Software/Visual Studio Code/install.sh +++ b/scripts/Software/Visual Studio Code/install.sh @@ -2,21 +2,21 @@ # Elevate script if [ ! "$UID" -eq 0 ] then - sudo bash "$BASH_SOURCE" + sudo bash "$BASH_SOURCE"; else - apt install -y wget gpg - keyFile=$(mktemp) + apt install -y wget gpg; + keyFile=$(mktemp); wget -qO- https://packages.microsoft.com/keys/microsoft.asc \ - | gpg --dearmor > $keyFile + | gpg --dearmor > $keyFile; - install -D -o root -g root -m 644 $keyFile /etc/apt/keyrings/packages.microsoft.gpg + install -D -o root -g root -m 644 $keyFile /etc/apt/keyrings/packages.microsoft.gpg; echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/keyrings/packages.microsoft.gpg] https://packages.microsoft.com/repos/code stable main" \ - | tee /etc/apt/sources.list.d/vscode.list + | tee /etc/apt/sources.list.d/vscode.list; - rm -f $keyFile + rm -f $keyFile; - apt update - apt install -y code + apt update; + apt install -y code; fi diff --git a/scripts/Software/Woodpecker CLI/install.sh b/scripts/Software/Woodpecker CLI/install.sh index 3be1a232..575fac70 100755 --- a/scripts/Software/Woodpecker CLI/install.sh +++ b/scripts/Software/Woodpecker CLI/install.sh @@ -2,11 +2,11 @@ # Elevate script if [ ! "$UID" -eq 0 ] then - sudo bash "$BASH_SOURCE" + sudo bash "$BASH_SOURCE"; else - workingDirectory=$(pwd) - contextRoot=$(mktemp -d) - cd $contextRoot + workingDirectory=$(pwd); + contextRoot=$(mktemp -d); + cd $contextRoot; # Preview from docker container # container_id="$(docker create woodpeckerci/woodpecker-cli:next)" @@ -14,11 +14,11 @@ else # Latest from GitHub wget https://github.com/woodpecker-ci/woodpecker/releases/download/v0.15.5/woodpecker-cli_linux_amd64.tar.gz \ - -O woodpecker-cli.tar.gz + -O woodpecker-cli.tar.gz; - tar -xvzf woodpecker-cli.tar.gz - install woodpecker-cli /usr/local/bin + tar -xvzf woodpecker-cli.tar.gz; + install woodpecker-cli /usr/local/bin; - cd $workingDirectory - rm -rf $contextRoot + cd $workingDirectory; + rm -rf $contextRoot; fi diff --git a/scripts/Software/common-apt/install.sh b/scripts/Software/common-apt/install.sh index 37eefbeb..ec0276e7 100755 --- a/scripts/Software/common-apt/install.sh +++ b/scripts/Software/common-apt/install.sh @@ -2,7 +2,7 @@ # Elevate script if [ ! "$UID" -eq 0 ] then - sudo bash "$BASH_SOURCE" + sudo bash "$BASH_SOURCE"; else - apt install -y screen steam vim docker.io docker-compose + apt install -y screen steam vim docker.io docker-compose; fi diff --git a/scripts/Software/logo-ls/install.sh b/scripts/Software/logo-ls/install.sh index 8346e097..b8a4990b 100755 --- a/scripts/Software/logo-ls/install.sh +++ b/scripts/Software/logo-ls/install.sh @@ -2,18 +2,18 @@ # Elevate script if [ ! "$UID" -eq 0 ] then - sudo bash "$BASH_SOURCE" "$USER" + sudo bash "$BASH_SOURCE" "$USER"; else - package=$(mktemp) - wget https://github.com/Yash-Handa/logo-ls/releases/download/v1.3.7/logo-ls_amd64.deb -O $package - dpkg -i $package - rm -f $package + package=$(mktemp); + wget https://github.com/Yash-Handa/logo-ls/releases/download/v1.3.7/logo-ls_amd64.deb -O $package; + dpkg -i $package; + rm -f $package; - homeDir=$(sudo -u $1 bash -c 'realpath ~') + homeDir=$(sudo -u $1 bash -c 'realpath ~'); { - echo "alias ls='logo-ls -D'" - echo "alias ll='ls -al'" - echo "alias l='ls'" - } | sudo -u $1 tee -a $homeDir/.bashrc + echo "alias ls='logo-ls -D'"; + echo "alias ll='ls -al'"; + echo "alias l='ls'"; + } | sudo -u $1 tee -a $homeDir/.bashrc; fi diff --git a/scripts/Software/rclone/install.sh b/scripts/Software/rclone/install.sh index 49fa8e4e..24911d00 100755 --- a/scripts/Software/rclone/install.sh +++ b/scripts/Software/rclone/install.sh @@ -2,12 +2,12 @@ # Elevate script if [ ! "$UID" -eq 0 ] then - sudo bash "$BASH_SOURCE" + sudo bash "$BASH_SOURCE"; else - package=$(mktemp) - wget https://github.com/rclone/rclone/releases/download/v1.60.0/rclone-v1.60.0-linux-amd64.deb -O $package - dpkg -i $package - rm -f $package + package=$(mktemp); + wget https://github.com/rclone/rclone/releases/download/v1.60.0/rclone-v1.60.0-linux-amd64.deb -O $package; + dpkg -i $package; + rm -f $package; - cp ${BASH_SOURCE%/*}/rclone@.service /etc/systemd/user + cp ${BASH_SOURCE%/*}/rclone@.service /etc/systemd/user; fi diff --git a/scripts/Software/tea/install.sh b/scripts/Software/tea/install.sh index 46084ccb..6646439d 100755 --- a/scripts/Software/tea/install.sh +++ b/scripts/Software/tea/install.sh @@ -2,15 +2,15 @@ # Elevate script if [ ! "$UID" -eq 0 ] then - sudo bash "$BASH_SOURCE" + sudo bash "$BASH_SOURCE"; else - workingDirectory=$(pwd) - contextRoot=$(mktemp -d) - cd $contextRoot + workingDirectory=$(pwd); + contextRoot=$(mktemp -d); + cd $contextRoot; - wget https://dl.gitea.io/tea/0.9.0/tea-0.9.0-linux-amd64 -O tea - install tea /usr/local/bin + wget https://dl.gitea.io/tea/0.9.0/tea-0.9.0-linux-amd64 -O tea; + install tea /usr/local/bin; - cd $workingDirectory - rm -rf $contextRoot + cd $workingDirectory; + rm -rf $contextRoot; fi