Skip to content

Report Omarchy to Steam instead of Arch Linux #284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
spaceXrace wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −10
Open

Report Omarchy to Steam instead of Arch Linux #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions pkgbuilds/omarchy-settings-dev/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ makedepends=(

# backup=() is pacman's hook for protecting user edits to package-owned files
# on upgrade. Only the paths the package actually installs into /etc qualify.
# The etc-overrides set (faillock.conf, nsswitch.conf, cups-browsed.conf,
# The etc-overrides set (os-release, lsb-release, faillock.conf, nsswitch.conf, cups-browsed.conf,
# cups-files.conf, plymouthd.conf, /etc/skel/.bashrc) ships at
# /usr/share/omarchy/etc-overrides/
# and is cp -f'd by post_install — those paths are unowned by pacman and the
# scriptlet WILL clobber user edits on each upgrade (documented limitation).
# and is cp -f'd by post_install — the scriptlet WILL clobber user edits on
# each upgrade (documented limitation).
backup=(
'etc/fastfetch/config.jsonc'
'etc/mkinitcpio.conf.d/omarchy_hooks.conf'
Expand Down Expand Up @@ -217,6 +217,11 @@ DOCUMENTATION_URL="https://learn.omacom.io/2/the-omarchy-manual"
SUPPORT_URL="https://discord.gg/tXFUdasqhY"
BUG_REPORT_URL="https://github.com/basecamp/omarchy/issues"
LOGO=omarchy
EOF
cat >"$pkgdir/usr/share/omarchy/etc-overrides/lsb-release" <<EOF
DISTRIB_ID="Omarchy"
DISTRIB_RELEASE="rolling"
DISTRIB_DESCRIPTION="Omarchy"
EOF
for path in "${_etc_override_paths[@]}"; do
case "$path" in
Expand Down
5 changes: 3 additions & 2 deletions pkgbuilds/omarchy-settings-dev/omarchy-settings-dev.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@ _etc_overrides_apply() {
install -d /etc/plymouth /etc/security /etc/skel

# NOTE: these cp -f's are intentionally destructive on every install/upgrade.
# Users who customize /etc/os-release, /etc/plymouth/plymouthd.conf (theme
# Users who customize /etc/os-release, /etc/lsb-release, /etc/plymouth/plymouthd.conf (theme
# switch), /etc/cups/cups-browsed.conf, /etc/cups/cups-files.conf, /etc/nsswitch.conf,
# /etc/security/faillock.conf, or /etc/skel/.bashrc WILL have their changes
# reset to Omarchy defaults each time omarchy-settings-dev is upgraded. This is
# the trade-off of routing upstream-owned paths through etc-overrides instead
# of pacman backup=().
rm -f /etc/os-release
cp -f /usr/share/omarchy/etc-overrides/os-release /etc/os-release
cp -f /usr/share/omarchy/etc-overrides/lsb-release /etc/lsb-release
cp -f /usr/share/omarchy/etc-overrides/security-faillock.conf /etc/security/faillock.conf
cp -f /usr/share/omarchy/etc-overrides/nsswitch.conf /etc/nsswitch.conf
if [[ -f /etc/cups/cups-browsed.conf ]]; then
Expand All @@ -27,7 +28,7 @@ _etc_overrides_apply() {
fi
cp -f /usr/share/omarchy/etc-overrides/plymouth-plymouthd.conf /etc/plymouth/plymouthd.conf
cp -f /usr/share/omarchy/etc-overrides/dot.bashrc /etc/skel/.bashrc
chmod 0644 /etc/os-release /etc/security/faillock.conf /etc/nsswitch.conf \
chmod 0644 /etc/os-release /etc/lsb-release /etc/security/faillock.conf /etc/nsswitch.conf \
/etc/plymouth/plymouthd.conf /etc/skel/.bashrc
if [[ -f /etc/cups/cups-browsed.conf ]]; then
chmod 0644 /etc/cups/cups-browsed.conf
Expand Down
11 changes: 8 additions & 3 deletions pkgbuilds/omarchy-settings/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ makedepends=(

# backup=() is pacman's hook for protecting user edits to package-owned files
# on upgrade. Only the paths the package actually installs into /etc qualify.
# The etc-overrides set (faillock.conf, nsswitch.conf, cups-browsed.conf,
# The etc-overrides set (os-release, lsb-release, faillock.conf, nsswitch.conf, cups-browsed.conf,
# cups-files.conf, plymouthd.conf, /etc/skel/.bashrc) ships at
# /usr/share/omarchy/etc-overrides/
# and is cp -f'd by post_install — those paths are unowned by pacman and the
# scriptlet WILL clobber user edits on each upgrade (documented limitation).
# and is cp -f'd by post_install — the scriptlet WILL clobber user edits on
# each upgrade (documented limitation).
backup=(
'etc/fastfetch/config.jsonc'
'etc/mkinitcpio.conf.d/omarchy_hooks.conf'
Expand Down Expand Up @@ -212,6 +212,11 @@ DOCUMENTATION_URL="https://learn.omacom.io/2/the-omarchy-manual"
SUPPORT_URL="https://discord.gg/tXFUdasqhY"
BUG_REPORT_URL="https://github.com/basecamp/omarchy/issues"
LOGO=omarchy
EOF
cat >"$pkgdir/usr/share/omarchy/etc-overrides/lsb-release" <<EOF
DISTRIB_ID="Omarchy"
DISTRIB_RELEASE="rolling"
DISTRIB_DESCRIPTION="Omarchy"
EOF
for path in "${_etc_override_paths[@]}"; do
case "$path" in
Expand Down
5 changes: 3 additions & 2 deletions pkgbuilds/omarchy-settings/omarchy-settings.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@ _etc_overrides_apply() {
install -d /etc/plymouth /etc/security /etc/skel

# NOTE: these cp -f's are intentionally destructive on every install/upgrade.
# Users who customize /etc/os-release, /etc/plymouth/plymouthd.conf (theme
# Users who customize /etc/os-release, /etc/lsb-release, /etc/plymouth/plymouthd.conf (theme
# switch), /etc/cups/cups-browsed.conf, /etc/cups/cups-files.conf, /etc/nsswitch.conf,
# /etc/security/faillock.conf, or /etc/skel/.bashrc WILL have their changes
# reset to Omarchy defaults each time omarchy-settings is upgraded. This is
# the trade-off of routing upstream-owned paths through etc-overrides instead
# of pacman backup=().
rm -f /etc/os-release
cp -f /usr/share/omarchy/etc-overrides/os-release /etc/os-release
cp -f /usr/share/omarchy/etc-overrides/lsb-release /etc/lsb-release
cp -f /usr/share/omarchy/etc-overrides/security-faillock.conf /etc/security/faillock.conf
cp -f /usr/share/omarchy/etc-overrides/nsswitch.conf /etc/nsswitch.conf
if [[ -f /etc/cups/cups-browsed.conf ]]; then
Expand All @@ -27,7 +28,7 @@ _etc_overrides_apply() {
fi
cp -f /usr/share/omarchy/etc-overrides/plymouth-plymouthd.conf /etc/plymouth/plymouthd.conf
cp -f /usr/share/omarchy/etc-overrides/dot.bashrc /etc/skel/.bashrc
chmod 0644 /etc/os-release /etc/security/faillock.conf /etc/nsswitch.conf \
chmod 0644 /etc/os-release /etc/lsb-release /etc/security/faillock.conf /etc/nsswitch.conf \
/etc/plymouth/plymouthd.conf /etc/skel/.bashrc
if [[ -f /etc/cups/cups-browsed.conf ]]; then
chmod 0644 /etc/cups/cups-browsed.conf
Expand Down