forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

main/postmarketos-ui-i3wm|mate|xfce4: remove deinstall scripts (MR 3064)

Browse source 
postmarketos-ui-i3wm|mate.post-deinstall:
Contains removal of file "61-autologin.conf"|"65-autologin.conf".
However, this file is removed by apk automatically unpon
deinstallation.

postmarketos-ui-i3wm|mate|xfce4.pre-deinstall:
Contains disabling service "lightdm". Removing display manager service
upon deinstallation isn't done by other UIs either. It can lead to
unexpected behaviour when installing another UI using lightdm and then
uninstall MATE UI.

Additionally
postmarketos-ui-i3wm.post-upgrade:
Removed postmarketos-ui-i3wm.post-upgrade and replaced it with a link to
postmarketos-ui-i3wm.post-install, like it's done in MATE and Xfce4.
This commit is contained in:
Jakob Hauser 2022-04-06 18:31:11 +02:00 committed by Caleb Connolly
parent cb31d2f496
commit f6c2712322
No known key found for this signature in database
GPG key ID: 0583312B195F64B6
9 changed files with 7 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main/postmarketos-ui-i3wm/APKBUILD
View file

@ -2,7 +2,7 @@
# Maintainer: Martijn Braam <martijn@brixit.nl> # Maintainer: Martijn Braam <martijn@brixit.nl>
pkgname=postmarketos-ui-i3wm pkgname=postmarketos-ui-i3wm
pkgver=0.3 pkgver=0.3
pkgrel=9 pkgrel=10
pkgdesc="(X11) Tiling WM (keyboard required)" pkgdesc="(X11) Tiling WM (keyboard required)"
url="https://i3wm.org" url="https://i3wm.org"
arch="noarch" arch="noarch"
@ -25,7 +25,7 @@ depends="
xorg-server xorg-server
xset xset
" "
install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall $pkgname.post-upgrade" install="$pkgname.post-install $pkgname.post-upgrade"
source="lock.sh 65-lightdm-autologin.conf" source="lock.sh 65-lightdm-autologin.conf"
options="!check" options="!check"

3
main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.post-deinstall
View file

@ -1,3 +0,0 @@
#!/bin/sh
rm /usr/share/lightdm/lightdm.conf.d/65-autologin.conf

4
main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.post-upgrade
View file

@ -1,4 +0,0 @@
#!/bin/sh
sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/65-autologin.conf
rc-update add lightdm default

1
main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.post-upgrade Symbolic link
View file

@ -0,0 +1 @@
postmarketos-ui-i3wm.post-install

3
main/postmarketos-ui-i3wm/postmarketos-ui-i3wm.pre-deinstall
View file

@ -1,3 +0,0 @@
#!/bin/sh
rc-update del lightdm

4
main/postmarketos-ui-mate/APKBUILD
View file

@ -2,7 +2,7 @@
# Maintainer: Jakko <jahau@rocketmail.com> # Maintainer: Jakko <jahau@rocketmail.com>
pkgname=postmarketos-ui-mate pkgname=postmarketos-ui-mate
pkgver=5 pkgver=5
pkgrel=1 pkgrel=2
pkgdesc="(X11) MATE Desktop Environment, fork of GNOME2 (stylus recommended)" pkgdesc="(X11) MATE Desktop Environment, fork of GNOME2 (stylus recommended)"
url="http://mate-desktop.org/" url="http://mate-desktop.org/"
arch="noarch" arch="noarch"
@ -31,7 +31,7 @@ _pmb_recommends="
pulseaudio-utils pulseaudio-utils
unclutter-xfixes unclutter-xfixes
" "
install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-deinstall $pkgname.post-upgrade" install="$pkgname.post-install $pkgname.post-upgrade"
source=" source="
000-system-background.gschema.override 000-system-background.gschema.override
001-screensaver.gschema.override 001-screensaver.gschema.override

3
main/postmarketos-ui-mate/postmarketos-ui-mate.post-deinstall
View file

@ -1,3 +0,0 @@
#!/bin/sh
rm /usr/share/lightdm/lightdm.conf.d/61-autologin.conf

3
main/postmarketos-ui-mate/postmarketos-ui-mate.pre-deinstall
View file

@ -1,3 +0,0 @@
#!/bin/sh
rc-update del lightdm

4
main/postmarketos-ui-xfce4/APKBUILD
View file

@ -2,7 +2,7 @@
# Maintainer: Jakko <jahau@rocketmail.com> # Maintainer: Jakko <jahau@rocketmail.com>
pkgname=postmarketos-ui-xfce4 pkgname=postmarketos-ui-xfce4
pkgver=0.5.1 pkgver=0.5.1
pkgrel=3 pkgrel=4
pkgdesc="(X11) Lightweight desktop (stylus recommended)" pkgdesc="(X11) Lightweight desktop (stylus recommended)"
url="https://gitlab.com/postmarketOS/xfce4-phone" url="https://gitlab.com/postmarketOS/xfce4-phone"
arch="noarch" arch="noarch"
@ -39,7 +39,7 @@ _pmb_recommends="
xfce4-terminal xfce4-terminal
xfce4-whiskermenu-plugin xfce4-whiskermenu-plugin
" "
install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade" install="$pkgname.post-install $pkgname.post-upgrade"
source=" source="
xfce4-phone-$pkgver.tar.gz::https://gitlab.com/postmarketOS/xfce4-phone/-/archive/$pkgver/xfce4-phone-$pkgver.tar.gz xfce4-phone-$pkgver.tar.gz::https://gitlab.com/postmarketOS/xfce4-phone/-/archive/$pkgver/xfce4-phone-$pkgver.tar.gz
10_onboard.gschema.override 10_onboard.gschema.override

3
main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.pre-deinstall
View file

@ -1,3 +0,0 @@
#!/bin/sh
rc-update del lightdm