mirror of
https://github.com/basecamp/omarchy.git
synced 2025-07-27 20:29:24 +00:00
Compare commits
3 Commits
v1.5.2
...
49efa1c3f1
Author | SHA1 | Date | |
---|---|---|---|
49efa1c3f1 | |||
87e55b193b | |||
cc0ac314ef |
@ -11,9 +11,7 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Get the latest while trying to preserve any modifications
|
# Get the latest while trying to preserve any modifications
|
||||||
git stash
|
git pull --autostash
|
||||||
git pull
|
|
||||||
git stash pop
|
|
||||||
|
|
||||||
# Run any pending migrations
|
# Run any pending migrations
|
||||||
for file in migrations/*.sh; do
|
for file in migrations/*.sh; do
|
||||||
|
10
install.sh
Executable file → Normal file
10
install.sh
Executable file → Normal file
@ -1,16 +1,8 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# Exit immediately if a command exits with a non-zero status
|
# Exit immediately if a command exits with a non-zero status
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
# Give people a chance to retry running the installation
|
# Give people a chance to retry running the installation
|
||||||
catch_errors() {
|
trap 'echo "Omarchy installation failed! You can retry by running: source ~/.local/share/omarchy/install.sh"' ERR
|
||||||
echo -e "\n\e[31mOmarchy installation failed!\e[0m"
|
|
||||||
echo "You can retry by running: bash ~/.local/share/omarchy/install.sh"
|
|
||||||
echo "Get help from the community: https://discord.gg/tXFUdasqhY"
|
|
||||||
}
|
|
||||||
|
|
||||||
trap catch_errors ERR
|
|
||||||
|
|
||||||
# Install everything
|
# Install everything
|
||||||
for f in ~/.local/share/omarchy/install/*.sh; do
|
for f in ~/.local/share/omarchy/install/*.sh; do
|
||||||
|
@ -11,12 +11,3 @@ sudo systemctl enable docker
|
|||||||
|
|
||||||
# Give this user privileged Docker access
|
# Give this user privileged Docker access
|
||||||
sudo usermod -aG docker ${USER}
|
sudo usermod -aG docker ${USER}
|
||||||
|
|
||||||
# Prevent Docker from preventing boot for network-online.target
|
|
||||||
sudo mkdir -p /etc/systemd/system/docker.service.d
|
|
||||||
sudo tee /etc/systemd/system/docker.service.d/no-block-boot.conf <<'EOF'
|
|
||||||
[Unit]
|
|
||||||
DefaultDependencies=no
|
|
||||||
EOF
|
|
||||||
|
|
||||||
sudo systemctl daemon-reload
|
|
||||||
|
@ -109,16 +109,6 @@ PAMName=login
|
|||||||
WantedBy=graphical.target
|
WantedBy=graphical.target
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
# Make plymouth remain until graphical.target
|
|
||||||
sudo mkdir -p /etc/systemd/system/plymouth-quit.service.d
|
|
||||||
sudo tee /etc/systemd/system/plymouth-quit.service.d/wait-for-graphical.conf <<'EOF'
|
|
||||||
[Unit]
|
|
||||||
After=multi-user.target
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# Prevent plymouth-quit-wait.service
|
|
||||||
sudo systemctl mask plymouth-quit-wait.service
|
|
||||||
|
|
||||||
sudo systemctl daemon-reload
|
sudo systemctl daemon-reload
|
||||||
sudo systemctl enable omarchy-seamless-login.service
|
sudo systemctl enable omarchy-seamless-login.service
|
||||||
|
|
||||||
|
@ -1,15 +0,0 @@
|
|||||||
echo "Prevent docker from requiring network readiness on boot"
|
|
||||||
sudo mkdir -p /etc/systemd/system/docker.service.d/
|
|
||||||
sudo tee /etc/systemd/system/docker.service.d/no-block-boot.conf <<'EOF'
|
|
||||||
[Unit]
|
|
||||||
DefaultDependencies=no
|
|
||||||
EOF
|
|
||||||
|
|
||||||
sudo mkdir -p /etc/systemd/system/plymouth-quit.service.d/
|
|
||||||
sudo tee /etc/systemd/system/plymouth-quit.service.d/wait-for-graphical.conf <<'EOF'
|
|
||||||
[Unit]
|
|
||||||
After=multi-user.target
|
|
||||||
EOF
|
|
||||||
|
|
||||||
sudo systemctl daemon-reload
|
|
||||||
sudo systemctl mask plymouth-quit-wait.service
|
|
Binary file not shown.
After Width: | Height: | Size: 2.7 MiB |
Reference in New Issue
Block a user