Mirror/arch
1
0
Fork 0
mirror of https://codeberg.org/privacy1st/arch synced 2025-01-22 04:32:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

change naming of holoscript files: 20-$pkgname

Browse Source
This commit is contained in:
Daniel Langbein 2021-07-05 11:36:19 +02:00
parent eda86cbb2c
commit c53d6a649d
21 changed files with 48 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/runConfigurations/build_tmp.xml → .idea/runConfigurations/build_all_tmp.xml generated
View File

@ -1,5 +1,5 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="build-tmp" type="ShConfigurationType">
<configuration default="false" name="build-all tmp" type="ShConfigurationType">
<option name="SCRIPT_TEXT" value="" />
<option name="INDEPENDENT_SCRIPT_PATH" value="true" />
<option name="SCRIPT_PATH" value="$PROJECT_DIR$/build-pkg/build-all" />

2
notes.md
View File

@ -38,7 +38,7 @@ Example: [pkg/de-p1st-sudo/PKGBUILD](pkg/de-p1st-sudo/PKGBUILD)
* [https://github.com/holocm/holo/blob/master/doc/holo-files.8.pod]()
```shell
install -Dm0544 some-config.conf.holoscript "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/path/to/some-config.conf.holoscript
install -Dm0544 some-config.conf.holoscript "$pkgdir"/usr/share/holo/files/20-"$pkgname"/etc/path/to/some-config.conf.holoscript
```
Example:

6
pkg/de-p1st-gnupg/PKGBUILD
View File

@ -2,7 +2,7 @@
_pkgname=gnupg
_reponame=arch
pkgname="de-p1st-$_pkgname"
pkgver=0.0.9
pkgver=0.0.10
pkgrel=1
pkgdesc="gnupg with configuration"
arch=('any')
@ -22,8 +22,8 @@ package() {
install -Dm0600 gpg.conf "$pkgdir"/etc/skel/.gnupg/gpg.conf
install -Dm0600 gpg-agent.conf "$pkgdir"/etc/skel/.gnupg/gpg-agent.conf
install -Dm0544 interactive-shell.holoscript "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/bash.bashrc.holoscript
install -Dm0544 interactive-shell.holoscript "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/zsh/zshrc.holoscript
install -Dm0544 interactive-shell.holoscript "$pkgdir"/usr/share/holo/files/20-"$pkgname"/etc/bash.bashrc.holoscript
install -Dm0544 interactive-shell.holoscript "$pkgdir"/usr/share/holo/files/20-"$pkgname"/etc/zsh/zshrc.holoscript
install -Dm0644 94F3D3DDAC22802258FC044B6C47C753F0823002.pub "$pkgdir"/usr/share/gnupg/94F3D3DDAC22802258FC044B6C47C753F0823002.pub
install -Dm0644 99_import_pubkey.sh "$pkgdir"/etc/profile.d/99_import_pubkey.sh

6
pkg/de-p1st-gpu-amdgpu/PKGBUILD
View File

@ -2,7 +2,7 @@
_pkgname=gpu-amdgpu
_reponame=arch
pkgname="de-p1st-$_pkgname"
pkgver=0.0.2
pkgver=0.0.3
pkgrel=1
pkgdesc="AMDGPU"
arch=('any')
@ -31,6 +31,6 @@ sha256sums=('SKIP')
package() {
cd "${_reponame}/pkg/${pkgname}"
# 10$pkgname as this shall be applied before de-p1st-mkinitcpio
install -Dm0544 mkinitcpio.conf.holoscript "$pkgdir"/usr/share/holo/files/10"$pkgname"/etc/mkinitcpio.conf.holoscript
# 10-$pkgname as this shall be applied before de-p1st-mkinitcpio
install -Dm0544 mkinitcpio.conf.holoscript "$pkgdir"/usr/share/holo/files/10-"$pkgname"/etc/mkinitcpio.conf.holoscript
}

2
pkg/de-p1st-installer/PKGBUILD
View File

@ -2,7 +2,7 @@
_pkgname=installer
_reponame=arch
pkgname="de-p1st-$_pkgname"
pkgver=0.1.19
pkgver=0.1.20
pkgrel=1
pkgdesc="Bash script to install Arch Linux"
arch=('any')

5
pkg/de-p1st-installer/de-p1st-installer.sh
View File

@ -432,12 +432,15 @@ function bootloader() {
# /etc/default/grub is managed by Holo. Therefore we should not manually modify it.
# Instead, we create a holosript which writes $LUKS_PART_UUID into GRUB_CMDLINE_LINUX of /etc/default/grub
{
# Assert
grep --quiet '^GRUB_CMDLINE_LINUX=""$' < /mnt/etc/default/grub || return
# Use filename .../20- for the holoscript so that it gets executed after the one from de-p1st-grub
local holoScriptDir=/mnt/usr/share/holo/files/20-de-p1st-installer/etc/default/
# The holoscript shall contain one 'sed "..."' command
sudo mkdir -p "${holoScriptDir}" || return $?
sudo echo '#!/bin/sh
sed "s|^GRUB_CMDLINE_LINUX=.*\$|GRUB_CMDLINE_LINUX=\"cryptdevice=/dev/disk/by-uuid/'"${LUKS_PART_UUID}"':crypt\"|"' \
sed "s|^GRUB_CMDLINE_LINUX=\"\"\$|GRUB_CMDLINE_LINUX=\"cryptdevice=/dev/disk/by-uuid/'"${LUKS_PART_UUID}"':crypt\"|"' \
| sudo tee "${holoScriptDir}"/grub.holoscript || return $?
sudo chmod 0544 "${holoScriptDir}"/grub.holoscript || return $?
}

8
pkg/de-p1st-locale/PKGBUILD
View File

@ -2,7 +2,7 @@
_pkgname=locale
_reponame=arch
pkgname="de-p1st-$_pkgname"
pkgver=0.1.0
pkgver=0.1.1
pkgrel=1
pkgdesc="locale and timezone"
arch=('any')
@ -24,10 +24,10 @@ package() {
# and then use holo with "--force" to overwrite the local version with the desired one
# (see .install script)
install -Dm0644 locale.conf "$pkgdir"/etc/locale.conf
install -Dm0644 locale.conf "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/locale.conf
install -Dm0644 locale.conf "$pkgdir"/usr/share/holo/files/20-"$pkgname"/etc/locale.conf
#
ln -sf /usr/share/zoneinfo/Europe/Berlin "$pkgdir"/etc/localtime
ln -sf /usr/share/zoneinfo/Europe/Berlin "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/localtime
ln -sf /usr/share/zoneinfo/Europe/Berlin "$pkgdir"/usr/share/holo/files/20-"$pkgname"/etc/localtime
install -Dm0644 locale.gen "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/locale.gen
install -Dm0644 locale.gen "$pkgdir"/usr/share/holo/files/20-"$pkgname"/etc/locale.gen
}

4
pkg/de-p1st-makepkg/PKGBUILD
View File

@ -2,7 +2,7 @@
_pkgname=makepkg
_reponame=arch
pkgname="de-p1st-$_pkgname"
pkgver=0.0.2
pkgver=0.0.3
pkgrel=1
pkgdesc="Personalized makepkg.conf"
arch=('any')
@ -18,5 +18,5 @@ sha256sums=('SKIP')
package() {
cd "${_reponame}/pkg/${pkgname}"
install -Dm0544 makepkg.conf.holoscript "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/makepkg.conf.holoscript
install -Dm0544 makepkg.conf.holoscript "$pkgdir"/usr/share/holo/files/20-"$pkgname"/etc/makepkg.conf.holoscript
}

6
pkg/de-p1st-mkinitcpio/PKGBUILD
View File

@ -2,7 +2,7 @@
_pkgname=mkinitcpio
_reponame=arch
pkgname="de-p1st-$_pkgname"
pkgver=0.0.10
pkgver=0.0.11
pkgrel=1
pkgdesc="mkinitcpio configuration"
arch=('any')
@ -17,6 +17,6 @@ sha256sums=('SKIP')
package() {
cd "${_reponame}/pkg/${pkgname}"
# 11$pkgname as this shall be applied after de-p1st-gpu-amdgpu
install -Dm0544 mkinitcpio.conf.holoscript "$pkgdir"/usr/share/holo/files/11"$pkgname"/etc/mkinitcpio.conf.holoscript
# 11-$pkgname as this shall be applied after de-p1st-gpu-amdgpu
install -Dm0544 mkinitcpio.conf.holoscript "$pkgdir"/usr/share/holo/files/11-"$pkgname"/etc/mkinitcpio.conf.holoscript
}

4
pkg/de-p1st-nano/PKGBUILD
View File

@ -2,7 +2,7 @@
_pkgname=nano
_reponame=arch
pkgname="de-p1st-$_pkgname"
pkgver=0.0.2
pkgver=0.0.3
pkgrel=1
pkgdesc="nano with configuration"
arch=('any')
@ -17,5 +17,5 @@ sha256sums=('SKIP')
package() {
cd "${_reponame}/pkg/${pkgname}"
install -Dm0544 nanorc.holoscript "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/nanorc.holoscript
install -Dm0544 nanorc.holoscript "$pkgdir"/usr/share/holo/files/20-"$pkgname"/etc/nanorc.holoscript
}

4
pkg/de-p1st-pacman-mirrorlist/PKGBUILD
View File

@ -2,7 +2,7 @@
_pkgname=pacman-mirrorlist
_reponame=arch
pkgname="de-p1st-$_pkgname"
pkgver=0.0.8
pkgver=0.0.9
pkgrel=1
pkgdesc="selected Arch Linux mirrors"
arch=('any')
@ -17,5 +17,5 @@ sha256sums=('SKIP')
package() {
cd "${_reponame}/pkg/${pkgname}"
install -Dm0644 mirrorlist "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/pacman.d/mirrorlist
install -Dm0644 mirrorlist "$pkgdir"/usr/share/holo/files/20-"$pkgname"/etc/pacman.d/mirrorlist
}

4
pkg/de-p1st-pacman/PKGBUILD
View File

@ -2,7 +2,7 @@
_pkgname=pacman
_reponame=arch
pkgname="de-p1st-$_pkgname"
pkgver=0.1.1
pkgver=0.1.2
pkgrel=1
pkgdesc="pacman with configuration"
arch=('any')
@ -20,5 +20,5 @@ package() {
install -Dm0644 pacman.d/de-p1st "$pkgdir"/etc/pacman.d/de-p1st
install -Dm0544 pacman.conf.holoscript "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/pacman.conf.holoscript
install -Dm0544 pacman.conf.holoscript "$pkgdir"/usr/share/holo/files/20-"$pkgname"/etc/pacman.conf.holoscript
}

4
pkg/de-p1st-screen/PKGBUILD
View File

@ -2,7 +2,7 @@
_pkgname=screen
_reponame=arch
pkgname="de-p1st-$_pkgname"
pkgver=0.0.3
pkgver=0.0.4
pkgrel=1
pkgdesc="screen with configuration"
arch=('any')
@ -17,5 +17,5 @@ sha256sums=('SKIP')
package() {
cd "${_reponame}/pkg/${pkgname}"
install -Dm0544 screenrc.holoscript "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/screenrc.holoscript
install -Dm0544 screenrc.holoscript "$pkgdir"/usr/share/holo/files/20-"$pkgname"/etc/screenrc.holoscript
}

8
pkg/de-p1st-sddm-theme-nordic/PKGBUILD
View File

@ -2,7 +2,7 @@
_pkgname=sddm-theme-nordic
_reponame=arch
pkgname="de-p1st-$_pkgname"
pkgver=0.0.6
pkgver=0.0.7
pkgrel=1
pkgdesc="sddm with Nordic theme"
arch=('any')
@ -30,10 +30,10 @@ package() {
# Replace theme background:
# Add symlink to background of "de-p1st-wallpaper"
install -dm0755 "$pkgdir"/usr/share/holo/files/"$pkgname"/usr/share/sddm/themes/Nordic/assets/
ln -s /usr/share/backgrounds/de-p1st.jpg "$pkgdir"/usr/share/holo/files/"$pkgname"/usr/share/sddm/themes/Nordic/assets/bg.jpg
install -dm0755 "$pkgdir"/usr/share/holo/files/20-"$pkgname"/usr/share/sddm/themes/Nordic/assets/
ln -s /usr/share/backgrounds/de-p1st.jpg "$pkgdir"/usr/share/holo/files/20-"$pkgname"/usr/share/sddm/themes/Nordic/assets/bg.jpg
# TODO: Fix upstream? See AUR comment: https://aur.archlinux.org/pkgbase/nordic-kde-git/#comment-807577
# Fix Nordic theme "Main.qml" -> Property "Battery" not found / missing
install -Dm0544 Main.qml.holoscript "$pkgdir"/usr/share/holo/files/"$pkgname"/usr/share/sddm/themes/Nordic/Main.qml.holoscript
install -Dm0544 Main.qml.holoscript "$pkgdir"/usr/share/holo/files/20-"$pkgname"/usr/share/sddm/themes/Nordic/Main.qml.holoscript
}

4
pkg/de-p1st-signal-desktop/PKGBUILD
View File

@ -2,7 +2,7 @@
_pkgname=signal-desktop
_reponame=arch
pkgname="de-p1st-$_pkgname"
pkgver=0.0.1
pkgver=0.0.2
pkgrel=1
pkgdesc="Signal Desktop with modified .desktop entry to start minimized in system tray"
arch=('any')
@ -19,5 +19,5 @@ package() {
cd "${_reponame}/pkg/${pkgname}"
# Holo files script do change the "Exec=" line of the .desktop file
install -Dm0544 signal-desktop.desktop.holoscript "$pkgdir"/usr/share/holo/files/"$pkgname"/usr/share/applications/signal-desktop.desktop.holoscript
install -Dm0544 signal-desktop.desktop.holoscript "$pkgdir"/usr/share/holo/files/20-"$pkgname"/usr/share/applications/signal-desktop.desktop.holoscript
}

4
pkg/de-p1st-smartcard/PKGBUILD
View File

@ -2,7 +2,7 @@
_pkgname=smartcard
_reponame=arch
pkgname="de-p1st-$_pkgname"
pkgver=0.0.3
pkgver=0.0.4
pkgrel=1
pkgdesc="Configuration to use smartcards"
arch=('any')
@ -18,6 +18,6 @@ sha256sums=('SKIP')
package() {
cd "${_reponame}/pkg/${pkgname}"
install -Dm0544 opensc.conf.holoscript "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/opensc.conf.holoscript
install -Dm0544 opensc.conf.holoscript "$pkgdir"/usr/share/holo/files/20-"$pkgname"/etc/opensc.conf.holoscript
install -Dm0644 systemd.preset "$pkgdir"/usr/lib/systemd/system-preset/20-"$pkgname".preset
}

4
pkg/de-p1st-ssh/PKGBUILD
View File

@ -2,7 +2,7 @@
_pkgname=ssh
_reponame=arch
pkgname="de-p1st-$_pkgname"
pkgver=0.0.8
pkgver=0.0.9
pkgrel=1
pkgdesc="ssh with configuration"
arch=('any')
@ -19,6 +19,6 @@ sha256sums=('SKIP')
package() {
cd "${_reponame}/pkg/${pkgname}"
install -Dm0544 sshd_config.holoscript "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/ssh/sshd_config.holoscript
install -Dm0544 sshd_config.holoscript "$pkgdir"/usr/share/holo/files/20-"$pkgname"/etc/ssh/sshd_config.holoscript
install -Dm0644 systemd.preset "$pkgdir"/usr/lib/systemd/system-preset/20-"$pkgname".preset
}

6
pkg/de-p1st-xfce4-hidpi/PKGBUILD
View File

@ -2,7 +2,7 @@
_pkgname=xfce4-hidpi
_reponame=arch
pkgname="de-p1st-$_pkgname"
pkgver=0.0.9
pkgver=0.0.10
pkgrel=1
pkgdesc="HiDPI for XFCE4"
arch=('any')
@ -18,8 +18,8 @@ depends=('de-p1st-xfce4')
package() {
cd "${_reponame}/pkg/${pkgname}"
install -Dm0544 xsettings.xml.holoscript "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml.holoscript
install -Dm0544 thunar.xml.holoscript "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml.holoscript
install -Dm0544 xsettings.xml.holoscript "$pkgdir"/usr/share/holo/files/20-"$pkgname"/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml.holoscript
install -Dm0544 thunar.xml.holoscript "$pkgdir"/usr/share/holo/files/20-"$pkgname"/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml.holoscript
install -Dm0644 99_hidpi.sh "$pkgdir"/etc/profile.d/99_hidpi.sh

4
pkg/de-p1st-xfce4/PKGBUILD
View File

@ -2,7 +2,7 @@
_pkgname=xfce4
_reponame=arch
pkgname="de-p1st-$_pkgname"
pkgver=0.0.27
pkgver=0.0.28
pkgrel=1
pkgdesc="XFCE4 with configuration"
arch=('any')
@ -100,7 +100,7 @@ package() {
cp -ra config "$pkgdir"/etc/skel/.config
# === shortcuts ===
install -Dm0544 xfce4-keyboard-shortcuts.xml.holoscript "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml.holoscript
install -Dm0544 xfce4-keyboard-shortcuts.xml.holoscript "$pkgdir"/usr/share/holo/files/20-"$pkgname"/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml.holoscript
# === display manager ===
install -Dm0644 systemd.preset "$pkgdir"/usr/lib/systemd/system-preset/20-"$pkgname".preset

4
pkg/de-p1st-zoom/PKGBUILD
View File

@ -2,7 +2,7 @@
_pkgname=zoom
_reponame=arch
pkgname="de-p1st-$_pkgname"
pkgver=0.0.1
pkgver=0.0.2
pkgrel=1
pkgdesc=".desktop to always run Zoom in Firejail"
arch=('any')
@ -19,5 +19,5 @@ package() {
cd "${_reponame}/pkg/${pkgname}"
# disable "Zoom" desktop entry as one should use "ZoomFirejail"
install -Dm0544 Zoom.desktop.holoscript "$pkgdir"/usr/share/holo/files/"$pkgname"/usr/share/applications/Zoom.desktop.holoscript
install -Dm0544 Zoom.desktop.holoscript "$pkgdir"/usr/share/holo/files/20-"$pkgname"/usr/share/applications/Zoom.desktop.holoscript
}

2
pkg/librist

@ -1 +1 @@
Subproject commit 00dce7e1c33439e78bbdc751efe0dfcfacd8570d
Subproject commit 7b98c45b816ac7e4e8e259c9bec73b2c244224e1