Skip to content

Commit 4a0c51d

Browse files
dhhdhh
committed
Merge branch 'master' into stable
2 parents fcb3e9c + 2245a99 commit 4a0c51d

17 files changed

+78
-52
lines changed

‎applications/About.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ cat <<EOF >~/.local/share/applications/About.desktop
33
Version=1.0
44
Name=About
55
Comment=System information from Fastfetch
6-
Exec=alacritty --config-file /home/$USER/.local/share/omakub/defaults/alacritty/pane.toml -e bash -c 'fastfetch; read -n 1 -s'
6+
Exec=alacritty --config-file /home/$USER/.local/share/omakub/defaults/alacritty/pane.toml --class=About --title=About -e bash -c 'fastfetch; read -n 1 -s'
77
Terminal=false
88
Type=Application
99
Icon=/home/$USER/.local/share/omakub/applications/icons/Ubuntu.png

‎applications/Activity.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ cat <<EOF >~/.local/share/applications/Activity.desktop
33
Version=1.0
44
Name=Activity
55
Comment=System activity from btop
6-
Exec=alacritty --config-file /home/$USER/.local/share/omakub/defaults/alacritty/btop.toml -e btop
6+
Exec=alacritty --config-file /home/$USER/.local/share/omakub/defaults/alacritty/btop.toml --class=Activity --title=Activity -e btop
77
Terminal=false
88
Type=Application
99
Icon=/home/$USER/.local/share/omakub/applications/icons/Activity.png

‎applications/Basecamp.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ cat <<EOF >~/.local/share/applications/Basecamp.desktop
33
Version=1.0
44
Name=Basecamp
55
Comment=Basecamp Project Management
6-
Exec=google-chrome --app="https://launchpad.37signals.com" --name=Basecamp
6+
Exec=google-chrome --app="https://launchpad.37signals.com" --name=Basecamp --class=Basecamp
77
Terminal=false
88
Type=Application
99
Icon=/home/$USER/.local/share/omakub/applications/icons/Basecamp.png

‎applications/Docker.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ cat <<EOF >~/.local/share/applications/Docker.desktop
33
Version=1.0
44
Name=Docker
55
Comment=Manage Docker containers with LazyDocker
6-
Exec=alacritty --config-file /home/$USER/.local/share/omakub/defaults/alacritty/pane.toml -e lazydocker
6+
Exec=alacritty --config-file /home/$USER/.local/share/omakub/defaults/alacritty/pane.toml --class=Docker --title=Docker -e lazydocker
77
Terminal=false
88
Type=Application
99
Icon=/home/$USER/.local/share/omakub/applications/icons/Docker.png

‎applications/HEY.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ cat <<EOF >~/.local/share/applications/HEY.desktop
33
Version=1.0
44
Name=HEY
55
Comment=HEY Email + Calendar
6-
Exec=google-chrome --app="https://app.hey.com/" --name=HEY
6+
Exec=google-chrome --app="https://app.hey.com/" --name=HEY --class=HEY
77
Terminal=false
88
Type=Application
99
Icon=/home/$USER/.local/share/omakub/applications/icons/HEY.png

‎applications/Neovim.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ cat <<EOF >~/.local/share/applications/Neovim.desktop
33
Version=1.0
44
Name=Neovim
55
Comment=Edit text files
6-
Exec=alacritty --config-file /home/$USER/.local/share/omakub/defaults/alacritty/pane.toml -e nvim %F
6+
Exec=alacritty --config-file /home/$USER/.local/share/omakub/defaults/alacritty/pane.toml --class=Neovim --title=Neovim -e nvim %F
77
Terminal=false
88
Type=Application
99
Icon=nvim

‎applications/Omakub.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ cat <<EOF >~/.local/share/applications/Omakub.desktop
33
Version=1.0
44
Name=Omakub
55
Comment=Omakub Controls
6-
Exec=alacritty --config-file /home/$USER/.local/share/omakub/defaults/alacritty/pane.toml -e omakub
6+
Exec=alacritty --config-file /home/$USER/.local/share/omakub/defaults/alacritty/pane.toml --class=Omakub --title=Omakub -e omakub
77
Terminal=false
88
Type=Application
99
Icon=/home/$USER/.local/share/omakub/applications/icons/Omakub.png

‎applications/WhatsApp.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ cat <<EOF >~/.local/share/applications/WhatsApp.desktop
33
Version=1.0
44
Name=WhatsApp
55
Comment=WhatsApp Messenger
6-
Exec=google-chrome --app="https://web.whatsapp.com" --name=WhatsApp
6+
Exec=google-chrome --app="https://web.whatsapp.com" --name=WhatsApp --class=Whatsapp
77
Terminal=false
88
Type=Application
99
Icon=/home/$USER/.local/share/omakub/applications/icons/WhatsApp.png

‎boot-dev.sh

-23
This file was deleted.

‎boot.sh

100644100755
+7-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,14 @@ echo -e "\nBegin installation (or abort with ctrl+c)..."
1515
sudo apt-get update >/dev/null
1616
sudo apt-get install -y git >/dev/null
1717

18-
echo "Cloning stable Omakub..."
18+
echo "Cloning Omakub..."
1919
rm -rf ~/.local/share/omakub
20-
git clone -b stable https://github.com/basecamp/omakub.git ~/.local/share/omakub >/dev/null
20+
git clone https://github.com/basecamp/omakub.git ~/.local/share/omakub >/dev/null
21+
if [[ $OMAKUB_REF != "master" ]]; then
22+
cd ~/.local/share/omakub
23+
git fetch origin "${OMAKUB_REF:-stable}" && git checkout FETCH_HEAD
24+
cd -
25+
fi
2126

2227
echo "Installation starting..."
2328
source ~/.local/share/omakub/install.sh

‎install.sh

+16-13
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,31 @@ set -e
44
# Desktop software and tweaks will only be installed if we're running Gnome
55
RUNNING_GNOME=$([[ "$XDG_CURRENT_DESKTOP" == *"GNOME"* ]] && echo true || echo false)
66

7+
# Check the distribution name and version and abort if incompatible
8+
source ~/.local/share/omakub/install/check-version.sh
9+
710
if $RUNNING_GNOME; then
8-
# Ensure computer doesn't go to sleep or lock while installing
9-
gsettings set org.gnome.desktop.screensaver lock-enabled false
10-
gsettings set org.gnome.desktop.session idle-delay 0
11+
# Ensure computer doesn't go to sleep or lock while installing
12+
gsettings set org.gnome.desktop.screensaver lock-enabled false
13+
gsettings set org.gnome.desktop.session idle-delay 0
1114

12-
echo "Get ready to make a few choices..."
13-
source ~/.local/share/omakub/install/terminal/required/app-gum.sh >/dev/null
14-
source ~/.local/share/omakub/first_run_choices.sh
15+
echo "Get ready to make a few choices..."
16+
source ~/.local/share/omakub/install/terminal/required/app-gum.sh >/dev/null
17+
source ~/.local/share/omakub/install/first-run-choices.sh
1518

16-
echo "Installing terminal and desktop tools.."
19+
echo "Installing terminal and desktop tools.."
1720
else
18-
echo "Only installing terminal tools..."
21+
echo "Only installing terminal tools..."
1922
fi
2023

2124
# Install terminal tools
2225
source ~/.local/share/omakub/install/terminal.sh
2326

2427
if $RUNNING_GNOME; then
25-
# Install desktop tools and tweaks
26-
source ~/.local/share/omakub/install/desktop.sh
28+
# Install desktop tools and tweaks
29+
source ~/.local/share/omakub/install/desktop.sh
2730

28-
# Revert to normal idle and lock settings
29-
gsettings set org.gnome.desktop.screensaver lock-enabled true
30-
gsettings set org.gnome.desktop.session idle-delay 300
31+
# Revert to normal idle and lock settings
32+
gsettings set org.gnome.desktop.screensaver lock-enabled true
33+
gsettings set org.gnome.desktop.session idle-delay 300
3134
fi

‎install/check-version.sh

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#!/bin/bash
2+
3+
# Function to check if running on Ubuntu 24.04 or higher
4+
check_ubuntu_version() {
5+
if [ -f /etc/os-release ]; then
6+
. /etc/os-release
7+
if [ "$ID" = "ubuntu" ]; then
8+
if awk -v ver="$VERSION_ID" 'BEGIN {exit !(ver >= 24.04)}'; then
9+
return 0
10+
else
11+
echo "Error: Ubuntu version must be 24.04 or higher. Current version: $VERSION_ID" >&2
12+
return 1
13+
fi
14+
else
15+
echo "Error: This script must be run on Ubuntu. Current OS: $ID" >&2
16+
return 1
17+
fi
18+
else
19+
echo "Error: Unable to determine OS. /etc/os-release file not found." >&2
20+
return 1
21+
fi
22+
}
23+
24+
if ! check_ubuntu_version; then
25+
echo "Script execution failed due to system requirements not being met." >&2
26+
exit 1
27+
fi

‎first_run_choices.sh ‎install/first-run-choices.sh

File renamed without changes.

‎install/terminal/apps-terminal.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sudo apt install -y fzf ripgrep bat eza zoxide plocate btop apache2-utils fd-find
1+
sudo apt install -y fzf ripgrep bat eza zoxide plocate btop apache2-utils fd-find tldr

‎install/terminal/libraries.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
sudo apt install -y \
2-
build-essential pkg-config autoconf bison clang \
3-
libssl-dev libreadline-dev zlib1g-dev libyaml-dev libreadline-dev libncurses5-dev libffi-dev libgdbm-dev libjemalloc2 \
4-
libvips imagemagick libmagickwand-dev mupdf mupdf-tools \
5-
redis-tools sqlite3 libsqlite3-0 libmysqlclient-dev
2+
build-essential pkg-config autoconf bison clang rustc \
3+
libssl-dev libreadline-dev zlib1g-dev libyaml-dev libreadline-dev libncurses5-dev libffi-dev libgdbm-dev libjemalloc2 \
4+
libvips imagemagick libmagickwand-dev mupdf mupdf-tools \
5+
redis-tools sqlite3 libsqlite3-0 libmysqlclient-dev libpq-dev postgresql-client postgresql-client-common

‎install/terminal/required/app-gum.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Gum is used for the Omakub commands for tailoring Omakub after the initial install
22
cd /tmp
33
GUM_VERSION="0.14.3" # Use known good version
4-
wget -qO gum.deb "https://github.com/charmbracelet/gum/releases/latest/download/gum_${GUM_VERSION}_amd64.deb"
4+
wget -qO gum.deb "https://github.com/charmbracelet/gum/releases/download/v${GUM_VERSION}/gum_${GUM_VERSION}_amd64.deb"
55
sudo apt-get install -y ./gum.deb
66
rm gum.deb
77
cd -

‎migrations/1722091912.sh

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
sudo echo "Running upgrade migration..."
2+
3+
# Add rustc and pgsql client libs
4+
source $OMAKUB_PATH/install/terminal/libraries.sh
5+
6+
# Set name and class for desktop files
7+
source $OMAKUB_PATH/applications/About.sh
8+
source $OMAKUB_PATH/applications/Activity.sh
9+
source $OMAKUB_PATH/applications/Basecamp.sh
10+
source $OMAKUB_PATH/applications/HEY.sh
11+
source $OMAKUB_PATH/applications/Docker.sh
12+
source $OMAKUB_PATH/applications/Neovim.sh
13+
source $OMAKUB_PATH/applications/Omakub.sh
14+
source $OMAKUB_PATH/applications/WhatsApp.sh

0 commit comments

Comments
 (0)