Merge pull request #567 from basecamp/master

Omakub v1.5.0

Author: dhh

bin/omakub-sub/theme.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-THEME_NAMES=("Tokyo Night" "Catppuccin" "Nord" "Everforest" "Gruvbox" "Kanagawa" "Ristretto" "Rose Pine" "Matte Black")
+THEME_NAMES=("Tokyo Night" "Catppuccin" "Nord" "Everforest" "Gruvbox" "Kanagawa" "Ristretto" "Rose Pine" "Matte Black" "Osaka Jade")
 THEME=$(gum choose "${THEME_NAMES[@]}" "<< Back" --header "Choose your theme" --height 12 | tr '[:upper:]' '[:lower:]' | sed 's/ /-/g')
 
 if [ -n "$THEME" ] && [ "$THEME" != "<<-back" ]; then

install/desktop.sh

@@ -4,4 +4,4 @@
 for installer in ~/.local/share/omakub/install/desktop/*.sh; do source $installer; done
 
 # Logout to pickup changes
-gum confirm "Ready to reboot for all settings to take effect?" && sudo reboot
+gum confirm "Ready to reboot for all settings to take effect?" && sudo reboot || true

install/desktop/app-obsidian.sh

@@ -1,5 +1,9 @@
 #!/bin/bash
 
 # Obsidian is a multi-platform note taking application. See https://obsidian.md
-gum spin --spinner meter --title "Obsidian installation about to start. It may take up to 20 minutes on some systems!" -- sleep 3
-flatpak install -y flathub md.obsidian.Obsidian
+cd /tmp
+OBSIDIAN_VERSION=$(curl -s https://api.github.com/repos/obsidianmd/obsidian-releases/releases/latest | grep -Po '"tag_name": "v\K[^"]*')
+wget -O obsidian.deb "https://github.com/obsidianmd/obsidian-releases/releases/latest/download/obsidian_${OBSIDIAN_VERSION}_amd64.deb"
+sudo apt install -y ./obsidian.deb
+rm obsidian.deb
+cd -

install/desktop/app-pinta.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-# FIXME: Get this out of snap
-sudo snap install pinta
+# Pinta is a simple drawing and image editing program. See https://www.pinta-project.com/
+flatpak install -y flathub com.github.PintaProject.Pinta

install/desktop/app-signal.sh

@@ -1,9 +1,13 @@
 #!/bin/bash
 
-wget -qO- https://updates.signal.org/desktop/apt/keys.asc | gpg --dearmor >signal-desktop-keyring.gpg
-cat signal-desktop-keyring.gpg | sudo tee /usr/share/keyrings/signal-desktop-keyring.gpg >/dev/null
-echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/signal-desktop-keyring.gpg] https://updates.signal.org/desktop/apt xenial main' |
-	sudo tee /etc/apt/sources.list.d/signal-xenial.list
-rm signal-desktop-keyring.gpg
+if [ ! -f /etc/apt/sources.list.d/signal-desktop.sources ]; then
+  [ -f /usr/share/keyrings/signal-desktop-keyring.gpg ] && sudo rm /usr/share/keyrings/signal-desktop-keyring.gpg
+  wget -O- https://updates.signal.org/desktop/apt/keys.asc | gpg --dearmor > signal-desktop-keyring.gpg;
+  cat signal-desktop-keyring.gpg | sudo tee /usr/share/keyrings/signal-desktop-keyring.gpg > /dev/null
+  wget -O signal-desktop.sources https://updates.signal.org/static/desktop/apt/signal-desktop.sources;
+  cat signal-desktop.sources | sudo tee /etc/apt/sources.list.d/signal-desktop.sources > /dev/null
+  rm signal-desktop-keyring.gpg signal-desktop.sources
+fi
+
 sudo apt update
 sudo apt install -y signal-desktop

install/desktop/app-typora.sh

@@ -1,20 +1,15 @@
 #!/bin/bash
 
-# Temporarily switch away from using Typora repo which is broken.
-#
-# wget -qO - https://typora.io/linux/public-key.asc | sudo tee /etc/apt/trusted.gpg.d/typora.asc >/dev/null || true
-#
-# sudo add-apt-repository -y 'deb https://typora.io/linux ./'
-# sudo add-apt-repository -y 'deb https://typora.io/linux ./'
-# sudo apt update -y
-# sudo apt install -y typora
+# Typora is a markdown editor and reader. See https://typora.io/
+if [ ! -f /etc/apt/sources.list.d/typora.list ]; then
+  [ -f /etc/apt/keyrings/typora.gpg ] && sudo rm /etc/apt/keyrings/typora.gpg
+  sudo mkdir -p /etc/apt/keyrings
+  curl -fsSL https://downloads.typora.io/typora.gpg | sudo tee /etc/apt/keyrings/typora.gpg > /dev/null
+  echo "deb [signed-by=/etc/apt/keyrings/typora.gpg] https://downloads.typora.io/linux ./" | sudo tee /etc/apt/sources.list.d/typora.list
+fi
 
-# Install with db
-cd /tmp
-wget -O typora.deb "https://downloads.typora.io/linux/typora_1.10.8_amd64.deb"
-sudo apt install -y /tmp/typora.deb
-rm typora.deb
-cd -
+sudo apt update
+sudo apt install typora -y
 
 # Add iA Typora theme
 mkdir -p ~/.config/Typora/themes

install/desktop/app-vscode.sh

@@ -1,17 +1,20 @@
 #!/bin/bash
 
-cd /tmp
-wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor >packages.microsoft.gpg
-sudo install -D -o root -g root -m 644 packages.microsoft.gpg /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" | sudo tee /etc/apt/sources.list.d/vscode.list >/dev/null
-rm -f packages.microsoft.gpg
-cd -
+if [ ! -f /etc/apt/keyrings/packages.microsoft.gpg ] || [ ! -f /usr/share/keyrings/microsoft.gpg ]; then
+  [ -f /etc/apt/keyrings/packages.microsoft.gpg ] && sudo rm /etc/apt/keyrings/packages.microsoft.gpg
+  cd /tmp
+  wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor >packages.microsoft.gpg
+  sudo install -D -o root -g root -m 644 packages.microsoft.gpg /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" | sudo tee /etc/apt/sources.list.d/vscode.list >/dev/null
+  rm -f packages.microsoft.gpg
+  cd -
+fi
 
-sudo apt update -y
+sudo apt update
 sudo apt install -y code
 
 mkdir -p ~/.config/Code/User
 cp ~/.local/share/omakub/configs/vscode.json ~/.config/Code/User/settings.json
 
 # Install default supported themes
-code --install-extension enkia.tokyo-night
+code --install-extension enkia.tokyo-night

install/desktop/optional/app-1password.sh

@@ -1,20 +1,8 @@
 #!/bin/bash
 
 # Install 1password and 1password-cli single script
-curl -sS https://downloads.1password.com/linux/keys/1password.asc | \
-sudo gpg --dearmor --output /usr/share/keyrings/1password-archive-keyring.gpg
-
-# Add apt repository
-echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/1password-archive-keyring.gpg] https://downloads.1password.com/linux/debian/$(dpkg --print-architecture) stable main" |
-sudo tee /etc/apt/sources.list.d/1password.list
-
-# Add the debsig-verify policy
-sudo mkdir -p /etc/debsig/policies/AC2D62742012EA22/
-curl -sS https://downloads.1password.com/linux/debian/debsig/1password.pol | \
-sudo tee /etc/debsig/policies/AC2D62742012EA22/1password.pol
-sudo mkdir -p /usr/share/debsig/keyrings/AC2D62742012EA22
-curl -sS https://downloads.1password.com/linux/keys/1password.asc | \
-sudo gpg --dearmor --output /usr/share/debsig/keyrings/AC2D62742012EA22/debsig.gpg
-
-# Install 1Password & 1password-cli
-sudo apt update && sudo apt install -y 1password 1password-cli
+cd /tmp
+wget https://downloads.1password.com/linux/debian/amd64/stable/1password-latest.deb -O 1password.deb
+sudo apt install ./1password.deb -y
+rm 1password.deb
+cd -

install/desktop/optional/app-brave.sh

@@ -1,6 +1,10 @@
 #!/bin/bash
 
-sudo 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" | sudo tee /etc/apt/sources.list.d/brave-browser-release.list
-sudo apt update -y
+if [ ! -f /etc/apt/sources.list.d/brave-browser-release.list ]; then
+  [ -f /usr/share/keyrings/brave-browser-archive-keyring.gpg ] && sudo rm /usr/share/keyrings/brave-browser-archive-keyring.gpg
+  sudo 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" | sudo tee /etc/apt/sources.list.d/brave-browser-release.list
+if
+
+sudo apt update
 sudo apt install -y brave-browser

install/desktop/optional/app-spotify.sh

@@ -1,7 +1,11 @@
 #!/bin/bash
 
 # Stream music using https://spotify.com
-curl -sS https://download.spotify.com/debian/pubkey_C85668DF69375001.gpg | sudo gpg --dearmor --yes -o /etc/apt/trusted.gpg.d/spotify.gpg
-echo "deb [signed-by=/etc/apt/trusted.gpg.d/spotify.gpg] https://repository.spotify.com stable non-free" | sudo tee /etc/apt/sources.list.d/spotify.list
-sudo apt update -y
+if [ ! -f /etc/apt/sources.list.d/spotify.list ]; then
+  [ -f /etc/apt/trusted.gpg.d/spotify.gpg ] && sudo rm /etc/apt/trusted.gpg.d/spotify.gpg
+  curl -sS https://download.spotify.com/debian/pubkey_C85668DF69375001.gpg | sudo gpg --dearmor --yes -o /etc/apt/trusted.gpg.d/spotify.gpg
+  echo "deb [signed-by=/etc/apt/trusted.gpg.d/spotify.gpg] https://repository.spotify.com stable non-free" | sudo tee /etc/apt/sources.list.d/spotify.list
+fi
+
+sudo apt update
 sudo apt install -y spotify-client