diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2015-06-11 16:34:01 +0200 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2015-06-11 16:34:11 +0200 |
| commit | 2f0ba64db461d6d802b31d13b42235ee792b1e2e (patch) | |
| tree | 103bf42b71f20ee7dc6a1a2043d55ba1698c9264 /main/xinit | |
| parent | d48e81184411eedbfcedb2890cc68484913ab512 (diff) | |
| download | aports-2f0ba64db461d6d802b31d13b42235ee792b1e2e.tar.bz2 aports-2f0ba64db461d6d802b31d13b42235ee792b1e2e.tar.xz | |
main/xinit: add global xinitrc.d support
Diffstat (limited to 'main/xinit')
| -rw-r--r-- | main/xinit/APKBUILD | 9 | ||||
| -rw-r--r-- | main/xinit/xinitrc | 5 |
2 files changed, 10 insertions, 4 deletions
diff --git a/main/xinit/APKBUILD b/main/xinit/APKBUILD index e48675fd54..885eace25d 100644 --- a/main/xinit/APKBUILD +++ b/main/xinit/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xinit pkgver=1.3.3 -pkgrel=3 +pkgrel=4 pkgdesc="X.Org initialisation program " url="http://xorg.freedesktop.org/" arch="all" @@ -49,22 +49,23 @@ package() { || return 1 install -m755 "$srcdir"/xserverrc "$pkgdir"/etc/X11/xinit/xserverrc \ || return 1 + mkdir -p "$pkgdir"/etc/X11/xinit/xinitrc.d || return 1 } md5sums="3b8da0e6237aee9828cc809c647510a7 xinit-1.3.3.tar.bz2 abd072ec435ce084cf4e89c58f83d45c 06_move_serverauthfile_into_tmp.patch -f5516933186d3a9e10a816d571877821 xinitrc +984b42988ca2219da98d4bd5d2c02406 xinitrc 4f04d2891ea87f50fde518267b7a1154 xsession.skel cf8c0ee89d86b2efa401563441d33560 Xsession 12edd1bd52ddf2084cf0972921db5a84 xserverrc" sha256sums="74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af xinit-1.3.3.tar.bz2 a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb 06_move_serverauthfile_into_tmp.patch -8a4095f56ec4603b0bad11f5b1b9595b38759ca16c8aeb98d4e271a86341e52c xinitrc +d346523fe8ec4f1ca95eee9f6a7045d41acb6a4ed6fd5d61f6d0ae75debc5578 xinitrc da325bbad10c1e05b61ef250c6cdada784be0a08b9f48984e691ea9a5abc9dd8 xsession.skel f79bb26d16e482be736bd2ba5f647fcf13084afdcdf5b9cc32ffe6cbf4c1955a Xsession 86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387 xserverrc" sha512sums="345d9a00991e25df0a565f5b7edfbf504df9e019fc8ca2d31e4d2899e4765d7a18f0fffec0b4dda5eef99982cf8482925656a4e18576105f267393de51257d65 xinit-1.3.3.tar.bz2 2296c10a5d74bff42d9642a4787dc3f2b77492fc81174af48dc88cd3c8fa49c7f70147b790d8c82c2df6c910d9d412965999e7a342ca28697a97b5d522669edd 06_move_serverauthfile_into_tmp.patch -2f36be3b581290206080e4c2e1d8001735d5c9f7d88f023cbafe69af6f82ef0ada39ee55e62aeca1a0000884ecff9e3d9565f62f73b3399596d73fcfeae84b83 xinitrc +dde1cb6732f3fc469139c4d8bed2d708a57b6346a235d6de03d239cb3e82e948c860c559023847bc365048e47c264c805d34751d979cd1bf4254a570151d4598 xinitrc 448bc6c7987a4735b6584e307cd5c53092b1a338043293f5f110d11818dd1b80508401a3b6f09525c82a16a88f293b37011d8ca112460b0f95d26897e3e0619e xsession.skel b311032a751bb21d6c49ffe1dfc67beb577b5d5bec4a4c12612c4c0f9b9d6d2a07f7435c7d2fe9ab4c318546ee0cb9d4ff3f7ef908e756a818da529e913e667d Xsession f86d96d76bcb340021e7904925f0029f8662e4dfc32489198b3a8695dca069da496539e2287249c763fe9c4d8d5d591fd18fe49a0bee822cbbd0eb712efbb89b xserverrc" diff --git a/main/xinit/xinitrc b/main/xinit/xinitrc index 424f2ac13d..07862ecf91 100644 --- a/main/xinit/xinitrc +++ b/main/xinit/xinitrc @@ -38,6 +38,11 @@ if [ -f "$HOME/.xinitrc" ]; then fi fi +if [ -d /etc/X11/xinit/xinitrc.d ] ; then + for f in /etc/X11/xinit/xinitrc.d/?* ; do + [ -x "$f" ] && . "$f" +done + # If not present, try the system default exec startxfce4 |