Try harder to ensure that even online installs have the intended packages for their channel
This commit is contained in:
@@ -17,6 +17,21 @@ ansi_art=' ▄▄▄
|
|||||||
clear
|
clear
|
||||||
echo -e "\n$ansi_art\n"
|
echo -e "\n$ansi_art\n"
|
||||||
|
|
||||||
|
# Use custom branch if instructed, otherwise default to master
|
||||||
|
OMARCHY_REF="${OMARCHY_REF:-master}"
|
||||||
|
|
||||||
|
# Set mirror based on branch
|
||||||
|
if [[ $OMARCHY_REF == "dev" ]]; then
|
||||||
|
export OMARCHY_MIRROR=edge
|
||||||
|
echo 'Server = https://mirror.omarchy.org/$repo/os/$arch' | sudo tee /etc/pacman.d/mirrorlist >/dev/null
|
||||||
|
elif [[ $OMARCHY_REF == "rc" ]]; then
|
||||||
|
export OMARCHY_MIRROR=rc
|
||||||
|
echo 'Server = https://rc-mirror.omarchy.org/$repo/os/$arch' | sudo tee /etc/pacman.d/mirrorlist >/dev/null
|
||||||
|
else
|
||||||
|
export OMARCHY_MIRROR=stable
|
||||||
|
echo 'Server = https://stable-mirror.omarchy.org/$repo/os/$arch' | sudo tee /etc/pacman.d/mirrorlist >/dev/null
|
||||||
|
fi
|
||||||
|
|
||||||
sudo pacman -Syu --noconfirm --needed git
|
sudo pacman -Syu --noconfirm --needed git
|
||||||
|
|
||||||
# Use custom repo if specified, otherwise default to basecamp/omarchy
|
# Use custom repo if specified, otherwise default to basecamp/omarchy
|
||||||
@@ -26,19 +41,10 @@ echo -e "\nCloning Omarchy from: https://github.com/${OMARCHY_REPO}.git"
|
|||||||
rm -rf ~/.local/share/omarchy/
|
rm -rf ~/.local/share/omarchy/
|
||||||
git clone "https://github.com/${OMARCHY_REPO}.git" ~/.local/share/omarchy >/dev/null
|
git clone "https://github.com/${OMARCHY_REPO}.git" ~/.local/share/omarchy >/dev/null
|
||||||
|
|
||||||
# Use custom branch if instructed, otherwise default to master
|
|
||||||
OMARCHY_REF="${OMARCHY_REF:-master}"
|
|
||||||
echo -e "\e[32mUsing branch: $OMARCHY_REF\e[0m"
|
echo -e "\e[32mUsing branch: $OMARCHY_REF\e[0m"
|
||||||
cd ~/.local/share/omarchy
|
cd ~/.local/share/omarchy
|
||||||
git fetch origin "${OMARCHY_REF}" && git checkout "${OMARCHY_REF}"
|
git fetch origin "${OMARCHY_REF}" && git checkout "${OMARCHY_REF}"
|
||||||
cd -
|
cd -
|
||||||
|
|
||||||
# Set edge mirror for dev installs
|
|
||||||
if [[ $OMARCHY_REF == "dev" ]]; then
|
|
||||||
export OMARCHY_MIRROR=edge
|
|
||||||
else
|
|
||||||
export OMARCHY_MIRROR=stable
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo -e "\nInstallation starting..."
|
echo -e "\nInstallation starting..."
|
||||||
source ~/.local/share/omarchy/install.sh
|
source ~/.local/share/omarchy/install.sh
|
||||||
|
|||||||
@@ -13,5 +13,5 @@ if [[ -n ${OMARCHY_ONLINE_INSTALL:-} ]]; then
|
|||||||
omarchy-pkg-add omarchy-keyring
|
omarchy-pkg-add omarchy-keyring
|
||||||
|
|
||||||
# Refresh all repos
|
# Refresh all repos
|
||||||
sudo pacman -Syyu --noconfirm
|
sudo pacman -Syyuu --noconfirm
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user