Skip to content

Commit 5017711

Browse files
committed
gdm-old: rework install script; vim-bash-support, vim-perl-completion: inside install files: remove slash before usr in vim path
1 parent 96b810e commit 5017711

File tree

3 files changed

+59
-11
lines changed

3 files changed

+59
-11
lines changed

gdm-old/gdm-old.install

Lines changed: 57 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,81 @@
11
pkgname=gdm-old
22

33
post_install() {
4+
printf -- "==> %s...\n" "Creating user and group: gdm"
45
getent group gdm &> /dev/null || groupadd -g 120 gdm
56
getent passwd gdm &> /dev/null || useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
67
passwd -l gdm > /dev/null
78
chown root:gdm /var/lib/gdm > /dev/null
89
chmod 1770 /var/lib/gdm > /dev/null
910

11+
printf -- "==> %s...\n" "Updating icon cache"
1012
gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
1113

14+
printf -- "==> %s...\n" "Refreshing systemd cache"
1215
systemctl --system daemon-reload
16+
1317
if systemctl is-enabled gdm.service &> /dev/null; then
18+
printf -- "==> %s...\n" "Reenabling gdm.service"
1419
systemctl reenable gdm.service 2>&1
20+
else
21+
# Arch-way = you decide
22+
printf -- ">\n> %s\n" \
23+
"If you want use GDM-old as default DM, run this commands:"
24+
local i
25+
if read i < <(systemctl cat display-manager.service 2> /dev/null); then
26+
i="${i##*/}"
27+
test -n "$i" || i="[service name]"
28+
printf -- "> * %s\n> %s\n> %s\n" \
29+
"Disable and stop currently used Display Manager:" \
30+
"# sudo systemctl disable $i" \
31+
"# sudo systemctl stop $i "
32+
fi
33+
printf -- "> * %s\n> %s\n> %s\n>\n" \
34+
"Enable and start GDM-old:" \
35+
"# sudo systemctl enable gdm.service" \
36+
"# sudo systemctl start gdm.service"
1537
fi
1638
}
1739

1840
post_upgrade() {
41+
printf -- "==> %s...\n" "Refreshing systemd cache"
1942
systemctl --system daemon-reload
20-
if systemctl is-active gdm-old.service &> /dev/null; then
21-
# using gdm-safe-restart (see: man 1 gdm)
22-
systemctl reload gdm-old.service 2>&1
23-
fi
24-
if systemctl is-active gdm.service &> /dev/null; then
25-
systemctl reload gdm.service 2>&1
26-
fi
43+
44+
local i
45+
for i in gdm.service gdm-old.service; do
46+
if systemctl is-active "$i" &> /dev/null; then
47+
printf -- "==> %s...\n" "Reloading $i (using: gdm-safe-restart)"
48+
systemctl reload "$i" 2>&1
49+
printf -- ">\n> %s\n>\n" \
50+
"You must relogin if you want use the new gdm version"
51+
break
52+
fi
53+
done
2754
}
2855

2956
post_remove() {
57+
printf -- "==> %s...\n" "Updating icon cache"
3058
gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
31-
getent passwd gdm || userdel gdm
32-
getent group gdm || groupdel gdm
59+
60+
printf -- "==> %s...\n" "Removing user and group: gdm"
61+
if getent passwd gdm &> /dev/null && ! userdel gdm; then
62+
printf -- ">\n> %s\n> %s\n> %s\n>\n" \
63+
"Can't remove user which is currently used by" \
64+
"gdm process... Stop gdm and retry manually:" \
65+
"# sudo userdel gdm && sudo groupdel gdm"
66+
else
67+
getent group gdm &> /dev/null && groupdel gdm &> /dev/null
68+
fi
69+
70+
printf -- "==> %s...\n" "Refreshing systemd cache"
71+
systemctl --system daemon-reload
72+
73+
# We can't use it anymore, this remove dead link
74+
local i
75+
for i in gdm.service gdm-old.service; do
76+
if systemctl is-enabled "$i" &> /dev/null; then
77+
printf -- "==> %s...\n" "Disabling $i"
78+
systemctl disable "$i" 2>&1
79+
fi
80+
done
3381
}

vim-bash-support/vimdoc.install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
vimdocinstall() {
22
echo -n "updating Vim help tags... "
3-
/usr/bin/vim --noplugin -u NONE -U NONE \
3+
usr/bin/vim --noplugin -u NONE -U NONE \
44
--cmd ":helptags /usr/share/vim/vimfiles/doc" --cmd ":q" > /dev/null 2>&1
55
echo "done."
66
}

vim-perl-completion/vimdoc.install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
vimdocinstall() {
22
echo -n "updating Vim help tags... "
3-
/usr/bin/vim --noplugin -u NONE -U NONE \
3+
usr/bin/vim --noplugin -u NONE -U NONE \
44
--cmd ":helptags /usr/share/vim/vimfiles/doc" --cmd ":q" > /dev/null 2>&1
55
echo "done."
66
}

0 commit comments

Comments
 (0)