mambareport: remove old kommander based GUI tool (new tool packaged as mambareport); update openmamba-makereport for new tool

Makefile

@@ -22,8 +22,6 @@ endif
 PACKAGE = desktop-base-openmamba
 DISTROID = openmamba
 
-WITHKDE3TOOLS := 1
-
 RPM_VENDOR = openmamba
 RPM_DISTRIBUTION = openmamba
 RPM_DISTROEXT = mamba
@@ -53,7 +51,6 @@ initrddir = ${sysconfdir}/rc.d/init.d
 mandir = ${prefix}/usr/share/man
 sysconfigdir= ${sysconfdir}/sysconfig
 profiledir = ${sysconfdir}/profile.d
-mambareportdatadir = ${datadir}/openmamba/mambareport
 mambaimagesdir = ${datadir}/openmamba/images
 iconsdir = ${datadir}/icons/hicolor
 localesdir = ${datadir}/locale
@@ -173,13 +170,8 @@ install-icons:
 	@$(INSTALL_DIR) $(DESTDIR)$(systemlogodir)/; \
 	$(INSTALL_DATA) menu/icons/hicolor/128x128/apps/openmamba.png $(DESTDIR)$(systemlogodir)/system-logo-white.png
 
-install-mambareport:
+install-openmamba-makereport:
-	$(INSTALL_SCRIPT) mambareport/openmamba-makereport $(DESTDIR)$(bindir)
+	$(INSTALL_SCRIPT) openmamba-makereport/openmamba-makereport $(DESTDIR)$(bindir)
-ifeq ($(WITHKDE3TOOLS),1)
-	@$(INSTALL_DIR) $(DESTDIR)$(mambareportdatadir)
-	$(INSTALL_SCRIPT) mambareport/mambareport.kmdr $(DESTDIR)$(mambareportdatadir)
-	$(INSTALL_DATA) mambareport/mambareport.desktop $(DESTDIR)$(xdg_appsdir)
-endif
 
 install-desktop:
 	@$(INSTALL_DIR) $(DESTDIR)$(distrodesktopdir)
@@ -197,7 +189,7 @@ install: $(pck_infiles:.in=) \
 	install-srpms \
 	install-desktop \
 	install-openmamba-update \
-	install-mambareport \
+	install-openmamba-makeeport \
 	install-locales \
 	install-icons
 

mambareport/mambareport.desktop

@@ -1,13 +0,0 @@
-[Desktop Entry]
-Name=openmamba system report
-Name[it]=Report del sistema openmamba
-GenericName=Creates a system report for debugging
-GenericName[it]=Genera un report del sistema
-Exec=kmdr-executor /usr/share/openmamba/mambareport/mambareport.kmdr
-Icon=mamba
-Terminal=0
-Type=Application
-Categories=X-openmamba;
-#X-KDE-RootOnly=true
-#X-KDE-SubstituteUID=true
-#X-KDE-Username=root

openmamba-makereport/openmamba-makereport

@@ -2,11 +2,11 @@
 #
 # openmamba system report generation tool
 #
-# Copyright (c) 2008-2019 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2008-2022 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 
-VERSION=20190304
+VERSION=20220618
-TEMPFILE=`tempfile`
+TEMPFILE=`mktemp`
 
 . ${ROOT}/etc/sysconfig/machine
 
@@ -28,16 +28,12 @@ SYSTEM_SERIAL_NUMBER=`echo $SYSTEM_SERIAL_NUMBER | tr ' ' _ | tr '-' _ | tr '/'
 
 REPORTNAME="openmamba-report-$SYSTEM_MANUFACTURER-$SYSTEM_PRODUCT_NAME-$SYSTEM_SERIAL_NUMBER.txt"
 
-if [ $1 ]; then
+if [ "$1" ]; then
-   REPORTNAME="$1/$REPORTNAME"
+   NOTE="$1"
 fi
 
-if [ $2 ]; then
+if [ "$2" ]; then
-   HOME="$2"
+   REPORTNAME="$2"
-fi
-
-if [ $3 ]; then
-   NOTE="$3"
 fi
 
 function catfile() {
@@ -80,7 +76,7 @@ function catinitramfs() {
 
    FILENAME=$1
    FILEDESC=$2
-   
+
    for c in $1; do
       TMPDIR=`mktemp -d`
 
@@ -123,7 +119,7 @@ _EOF
 }
 
 echo "openmamba report generation tool $VERSION"
-echo "Copyright (c) 2008-2019 by Silvan Calarco <info@openmamba.org>"
+echo "Copyright (c) 2008-2022 by Silvan Calarco <info@openmamba.org>"
 echo
 
 [ $UID = 0 ] || {
@@ -145,7 +141,7 @@ if [ "$NOTE" ]; then
 echo "
 REPORTED PROBLEM:
 =================" >> $TEMPFILE
-cat $NOTE >> $TEMPFILE
+cat "$NOTE" >> $TEMPFILE
 echo >> $TEMPFILE
 fi
 
@@ -200,8 +196,7 @@ catfile "/var/lib/alsa/asound.state" "Alsa mixer settings"
 catcommand "/sbin/ifconfig -a" "Network interfaces list"
 catcommand "/usr/sbin/iwconfig" "Wireless interfaces list"
 catcommand "/sbin/route -n" "Routing table"
-catfile "/etc/sysconfig/network" "General network configuration"
+catcommand "systemd-resolve --status" "DNS configuration"
-catfile "/etc/resolv.conf" "DNS configuration"
 
 # Disks
 for d in /dev/sd[a-z]; do
@@ -210,7 +205,6 @@ done
 
 # Installation
 catcommand "rpm -qa --last | head -n 100" "Last installed packages"
-catfile "/var/log/install-*" "Installation log"
 catfile /var/log/Xorg.5.log "Xorg installation test log"
 
 # Other details