From 124e036651b1474e492330c083421366e7438dc3 Mon Sep 17 00:00:00 2001
From: Daniel Tartavel <contact@librepc.com>
Date: Fri, 17 Apr 2020 15:45:59 +0200
Subject: [PATCH] bug selection Bureau

---
 SOURCES/lalistunnel   |  4 ++--
 SPECS/task-lalis.spec | 16 +++++++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/SOURCES/lalistunnel b/SOURCES/lalistunnel
index 9694467..eae1d66 100755
--- a/SOURCES/lalistunnel
+++ b/SOURCES/lalistunnel
@@ -1,6 +1,6 @@
 #!/usr/bin/sh
 
-ssh -i /usr/local/etc/ssh_id_rsa -p 10022 -N -f -R 6000:localhost:22 ssh@lalis69.ddns.net
-ssh -i /usr/local/etc/ssh_id_rsa -p 10022 -N -f -R 5900:localhost:5900 ssh@lalis69.ddns.net
+ssh -i /usr/share/lalis/ssh_id_rsa -p 10022 -N -f -R 6000:localhost:22 ssh@lalis69.ddns.net
+ssh -i /usr/share/lalis/ssh_id_rsa -p 10022 -N -f -R 5900:localhost:5900 ssh@lalis69.ddns.net
 x11vnc -nopw
 killall ssh
diff --git a/SPECS/task-lalis.spec b/SPECS/task-lalis.spec
index da4bf09..e9174d9 100755
--- a/SPECS/task-lalis.spec
+++ b/SPECS/task-lalis.spec
@@ -1,7 +1,7 @@
 Summary:	Install LALIS packages and configuration
 Name:		task-lalis
-Version:	5
-Release:	%mkrel 1
+Version:	5.1
+Release:	%mkrel 4
 License:	GPLv3
 Group:		Tools
 Url:		http://lalis.fr
@@ -87,7 +87,6 @@ Requires:		wpa_supplicant
 Requires:		lshw
 Requires:		x11-driver-input-synaptics
 Requires:		bsdiff
-#Requires:		fuse-exfat
 Requires:		mageia-theme-extra
 Requires:		gvfs-mtp
 Requires:		mtpfs
@@ -188,7 +187,7 @@ desktop()
 {
 	if [ -f "$1/.config/user-dirs.dirs" ]; then
 		DESKTOP=`grep XDG_DESKTOP_DIR $1/.config/user-dirs.dirs`
-		DESKTOP=${DESKTOP##*}
+		DESKTOP=`echo ${DESKTOP##*/} | sed -e s/\"//g`
 	else
 		DESKTOP=""
 	fi
@@ -209,7 +208,7 @@ fi
 if [ -z "`grep lalis /etc/ssh/sshd_config`" ]; then
 	echo "Allowusers lalis" >>/etc/ssh/sshd_config
 fi
-
+/usr/bin/systemctl restart sshd
 # Ajoute le fichier test.desktop sur le bureau de l'utilisateur lalis
 desktop /home/lalis
 echo $DESKTOP
@@ -237,10 +236,9 @@ do
 			if ! [ -d "$i/$DESKTOP" ]; then
 				su -c "mkdir $i/$DESKTOP" - "$USER"
 				echo "su -c mkdir $i/$DESKTOP - $USER"
-				cp -fa /usr/share/kio_desktop/Lalis.desktop "$i/$DESKTOP/"
-				chown $USER:$USER "$i/$DESKTOP"
 			fi
-			
+			cp -fa /usr/share/kio_desktop/Lalis.desktop "$i/$DESKTOP/"
+				chown $USER:$USER "$i/$DESKTOP"
 		fi
 	fi
 done
@@ -261,6 +259,6 @@ MGAVERSION=${U##*.mga}
 #adding lalis mirror
 grep -q 'lalis rsync://lalis69.ddns.net:10073/mageia/lalis/' /etc/urpmi/urpmi.cfg
 if [ ${?} -ne 0 ]; then
-	echo  -e "\nlalis rsync://lalis69.ddns.net:10073/mageia/lalis/8/x86_64/media/core {\n}" >>/etc/urpmi/urpmi.cfg
+	echo  -e "\nlalis rsync://lalis69.ddns.net:10073/mageia/lalis/$MGAVERSION/x86_64/media/core {\n}" >>/etc/urpmi/urpmi.cfg
 	echo "urpmi.update lalis;urpmi msttcore-fonts-installer" | at now +2 minutes
 fi