From 412fe86c92113a899c64f63438d6148ce82da90b Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Thu, 1 Oct 2020 20:23:46 +0200 Subject: [PATCH] Remove pre-systemd and pre-kde plasma show log menu entries --- Makefile | 6 +----- kde/scripts/showlog | 21 ------------------- menu/applications/logs/dmesg-log.desktop.in | 14 ------------- .../applications/logs/runlevel-log.desktop.in | 14 ------------- .../logs/runlevel0-log.desktop.in | 14 ------------- .../logs/runlevel6-log.desktop.in | 14 ------------- menu/applications/logs/sysinit-log.desktop.in | 14 ------------- 7 files changed, 1 insertion(+), 96 deletions(-) delete mode 100644 kde/scripts/showlog delete mode 100644 menu/applications/logs/dmesg-log.desktop.in delete mode 100644 menu/applications/logs/runlevel-log.desktop.in delete mode 100644 menu/applications/logs/runlevel0-log.desktop.in delete mode 100644 menu/applications/logs/runlevel6-log.desktop.in delete mode 100644 menu/applications/logs/sysinit-log.desktop.in diff --git a/Makefile b/Makefile index 8b05f57..59519cc 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Makefile for desktop-base-openmamba package -# Copyright (C) 2004-2019 by Silvan Calarco +# Copyright (C) 2004-2020 by Silvan Calarco # Copyright (C) 2005-2007 by Davide Madrisan include VERSION @@ -157,7 +157,6 @@ install-kde-distro-addons: dist-update cp -r etc/sysconfig $(DESTDIR)$(sysconfdir)/ cp etc/system-sleep/* $(DESTDIR)$(systemdsleepdir)/ chmod 755 $(DESTDIR)$(sysconfdir)/profile.d/*.sh - $(INSTALL_SCRIPT) kde/scripts/showlog $(DESTDIR)$(distrobindir) cp -r menu/icons/ $(DESTDIR)$(datadir)/icons/ install-distromenu: dist-update @@ -166,8 +165,6 @@ install-distromenu: dist-update $(DESTDIR)$(xdg_directorydir)/$(DISTROID).directory $(INSTALL_DATA) menu/applications/distroutils-netinstall.directory \ $(DESTDIR)$(xdg_directorydir)/$(DISTROID)-NetInstall.directory - $(INSTALL_DATA) menu/applications/distroutils-logs.directory \ - $(DESTDIR)$(xdg_directorydir)/$(DISTROID)-Logs.directory @$(INSTALL_DIR) $(DESTDIR)$(xdg_mergedmenudir) $(INSTALL_DATA) menu/applications/distroutils.menu \ $(DESTDIR)$(xdg_mergedmenudir)/$(DISTROid).menu @@ -176,7 +173,6 @@ install-distromenu: dist-update $(INSTALL_DATA) menu/applications/netinstall/$$pck.desktop \ $(DESTDIR)$(xdg_appsdir)/$(DISTROid)-$$pck.desktop;\ done - cp menu/applications/logs/*.desktop $(DESTDIR)$(xdg_appsdir) install-srpms: @$(INSTALL_DIR) $(DESTDIR)$(distrosrpmsdir) diff --git a/kde/scripts/showlog b/kde/scripts/showlog deleted file mode 100644 index 06fc3ec..0000000 --- a/kde/scripts/showlog +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# Copyright (c) 2004-2005 by Silvan Calarco -# Copyright (c) 2007 by Davide Madrisan - -displayfile="$1" -wintitle="$2" -winicon="$3" - -tmpfile=`mktemp -q -t ${0##*/}.XXXXXXXX` || - { echo "${0##*/}: error: cannot create temporary files." >&2 >> $logfile - { (exit 1); exit 1; }; } - -trap "rm -f $tmpfile" 0 1 2 5 15 - -sed "s|\x1b\[\S\{1,5\}[mG]||g" $displayfile > $tmpfile - -kdialog \ - --textbox $tmpfile 800 600 \ - --caption "$wintitle" - -exit 0 diff --git a/menu/applications/logs/dmesg-log.desktop.in b/menu/applications/logs/dmesg-log.desktop.in deleted file mode 100644 index 8583ba9..0000000 --- a/menu/applications/logs/dmesg-log.desktop.in +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Name=Kernel init messages -Name[es]=Mensajes de inicio del kernel -Name[it]=Messaggi di avvio del kernel -Name[fr]=Messages du démarrage du noyau -Comment=Messages from the Linux Kernel during system boot -Comment[es]=Mensajes del kernel durante el inicio del sistema -Comment[it]=Messaggi del kernel durante l'avvio del sistema -Comment[fr]=Messages du noyau lors du démarrage du système -Exec=@distrobindir@/showlog /var/log/dmesg.log "Kernel init messages" agent -Icon=utilities-log-viewer -Categories=X-@distroID@-Logs; diff --git a/menu/applications/logs/runlevel-log.desktop.in b/menu/applications/logs/runlevel-log.desktop.in deleted file mode 100644 index 5481f0b..0000000 --- a/menu/applications/logs/runlevel-log.desktop.in +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Name=Services startup -Name[es]=Inicio de los servicios -Name[it]=Avvio dei servizi -Name[fr]=Démarrage des services -Comment=Information about runlevel 5 services startup on boot -Comment[es]=Mensajes de inicio de los servicios en nivel 5 -Comment[it]=Informazioni sull'avvio dei servizi di runlevel 5 -Comment[fr]=Messages au démarrage des services du runlevel 5 -Exec=@distrobindir@/showlog /var/log/initd.5.start "Runlevel 5 init log" agent -Icon=utilities-log-viewer -Categories=X-@distroID@-Logs; diff --git a/menu/applications/logs/runlevel0-log.desktop.in b/menu/applications/logs/runlevel0-log.desktop.in deleted file mode 100644 index 83b7cc0..0000000 --- a/menu/applications/logs/runlevel0-log.desktop.in +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Name=Last shutdown -Name[es]=Último apagamiento -Name[it]=Ultimo spegnimento -Name[fr]=Dernier arrêt du système -Comment=Information about last system shutdown -Comment[es]=Mensajes sobre el último apagamiento -Comment[it]=Informazioni riguardo all'ultimo spegnimento del sistema -Comment[fr]=Messages du système lors du dernier arrêt -Exec=@distrobindir@/showlog /var/log/initd.0.stop "Last shutdown log" agent -Icon=utilities-log-viewer -Categories=X-@distroID@-Logs; diff --git a/menu/applications/logs/runlevel6-log.desktop.in b/menu/applications/logs/runlevel6-log.desktop.in deleted file mode 100644 index bf426fc..0000000 --- a/menu/applications/logs/runlevel6-log.desktop.in +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Name=Last reboot -Name[es]=Último reinicio -Name[it]=Ultimo riavvio -Name[fr]=Dernier redémarrage du système -Comment=Information about last system reboot -Comment[es]=Mensajes sobre el último reinicio -Comment[it]=Informazioni riguardo all'ultimo riavvio del sistema -Comment[fr]=Messages du système lors du dernier redémarrage -Exec=@distrobindir@/showlog /var/log/initd.6.stop "Last reboot log" agent -Icon=utilities-log-viewer -Categories=X-@distroID@-Logs; diff --git a/menu/applications/logs/sysinit-log.desktop.in b/menu/applications/logs/sysinit-log.desktop.in deleted file mode 100644 index 969873b..0000000 --- a/menu/applications/logs/sysinit-log.desktop.in +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Name=openmamba system init logs -Name[es]=Inicio del sistema -Name[it]=Avvio di sistema -Name[fr]=Démarrage du système -Comment=Messages during openmamba system boot -Comment[es]=Mensajes de inicio del sistema openmamba -Comment[it]=Messaggi di avvio del sistema openmamba -Comment[fr]=Messages au démerrage du système openmamba -Exec=@distrobindir@/showlog /var/log/initd.sysinit.start "System init log" agent -Icon=utilities-log-viewer -Categories=X-@distroID@-Logs;