Drop force, allow (almost) everything to just reinstall/update

bin/omakub-install

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 INSTALLER=$(gum file $OMAKUB_PATH/install)
-[ -n "$INSTALLER" ] && gum confirm "Run installer?" && FORCE=1 source $INSTALLER
+[ -n "$INSTALLER" ] && gum confirm "Run installer?" && source $INSTALLER

install/app-flameshot.sh

@@ -1,4 +1,2 @@
 # Flameshot is a nice step-up over the default Gnome screenshot tool
-if [ -n "$FORCE" ] || ! command -v flameshot &>/dev/null; then
 sudo apt install -y flameshot
-fi

install/app-github-cli.sh

@@ -1,7 +1,5 @@
-if ! command -v gh &>/dev/null; then
 curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg &&
 	sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg &&
 	echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list >/dev/null &&
 	sudo apt update &&
 	sudo apt install gh -y
-fi

install/app-neovim.sh

@@ -1,7 +1,8 @@
-if [ -n "$FORCE" ] || ! command -v neovim &>/dev/null; then
 sudo add-apt-repository -y ppa:neovim-ppa/stable
-	sudo apt update -y
+sudo apt update
 sudo apt install -y neovim
+
+if [ ! -d "$HOME/.config/nvim" ]; then
 	git clone https://github.com/LazyVim/starter ~/.config/nvim
 	cp ~/.local/share/omakub/themes/neovim/tokyo-night.lua ~/.config/nvim/lua/plugins/theme.lua
 fi

install/app-typora.sh

@@ -1,10 +1,8 @@
-if ! command -v typora &>/dev/null; then
 wget -qO - https://typoraio.cn/linux/public-key.asc | sudo tee /etc/apt/trusted.gpg.d/typora.asc
 sudo add-apt-repository 'deb https://typora.io/linux ./'
-	sudo apt-get update
+sudo apt update
-	sudo apt-get install -y typora
+sudo apt install -y typora
 
 # Add iA Typora theme
 ln -s ~/.local/share/omakub/themes/typora/ia_typora.css ~/.config/Typora/themes/
 ln -s ~/.local/share/omakub/themes/typora/ia_typora_night.css ~/.config/Typora/themes/
-fi

install/docker.sh

@@ -1,4 +1,3 @@
-if [ -n "$FORCE" ] || ! command -v docker &>/dev/null; then
 sudo apt install -y docker.io docker-buildx
 sudo usermod -aG docker ${USER}
 
@@ -11,4 +10,3 @@ if [ -n "$FORCE" ] || ! command -v docker &>/dev/null; then
 # FIXME: Add postgresql as a default configured DB as well
 sudo docker create --restart unless-stopped -p 3306:3306 --name=mysql8 -e MYSQL_ROOT_PASSWORD= -e MYSQL_ALLOW_EMPTY_PASSWORD=true mysql:8
 sudo docker create --restart unless-stopped -p 6379:6379 --name=redis redis
-fi

install/emojis.sh

@@ -1,5 +1,3 @@
-if [ -n "$FORCE" ] || [ ! -f "~/.XCompose" ]; then
 cp ~/.local/share/omakub/configs/xcompose ~/.XCompose
 ibus restart
 gsettings set org.gnome.desktop.input-sources xkb-options "['compose:caps']"
-fi

install/gnome-extensions.sh

@@ -1,4 +1,3 @@
-if [ -n "$FORCE" ] || ! command -v gnome-shell-extension-manager &>/dev/null; then
 sudo apt install -y gnome-shell-extension-manager pipx
 pipx install gnome-extensions-cli --system-site-packages
 
@@ -58,4 +57,3 @@ if [ -n "$FORCE" ] || ! command -v gnome-shell-extension-manager &>/dev/null; th
 gsettings set org.gnome.shell.extensions.space-bar.behavior smart-workspace-names false
 gsettings set org.gnome.shell.extensions.space-bar.shortcuts enable-activate-workspace-shortcuts false
 gsettings set org.gnome.shell.extensions.space-bar.shortcuts open-menu "@as []"
-fi

install/nodenv.sh

@@ -1,4 +1,4 @@
-if [ -n "$FORCE" ] || ! command -v nodenv &>/dev/null; then
+if ! command -v nodenv &>/dev/null; then
 	# FIXME: Make this pick whatever the latest LTS is
 	DEFAULT_NODE_VERSION="20.13.1"
 

install/ruby.sh

@@ -1,9 +1,18 @@
-if [ -n "$FORCE" ] || ! command -v rbenv &>/dev/null; then
 # FIXME: Change to use whatever latest release is
 DEFAULT_RUBY_VERSION="3.3.1"
 
 sudo apt install -y rbenv
+
+RUBY_BUILD_DIR="$(rbenv root)/plugins/ruby-build"
+
+# Check if the directory exists
+if [ -d "$RUBY_BUILD_DIR" ]; then
+	cd "$RUBY_BUILD_DIR" && git pull
+	cd -
+else
+	git clone https://github.com/rbenv/ruby-build.git "$RUBY_BUILD_DIR"
+fi
+
 git clone https://github.com/rbenv/ruby-build.git "$(rbenv root)"/plugins/ruby-build
 rbenv install $DEFAULT_RUBY_VERSION
 rbenv global $DEFAULT_RUBY_VERSION
-fi

install/zzz-ulauncher.sh

@@ -1,4 +1,3 @@
-if [ -n "$FORCE" ] || ! command -v ulauncher &>/dev/null; then
 sudo add-apt-repository universe -y
 sudo add-apt-repository ppa:agornostal/ulauncher -y
 sudo apt update -y
@@ -10,4 +9,3 @@ if [ -n "$FORCE" ] || ! command -v ulauncher &>/dev/null; then
 gtk-launch ulauncher.desktop
 sleep 2 # ensure enough time for ulauncher to set defaults
 cp ~/.local/share/omakub/configs/ulauncher.json ~/.config/ulauncher/settings.json
-fi