diff --git a/SOURCES/Lalis.desktop b/SOURCES/Lalis.desktop old mode 100755 new mode 100644 diff --git a/SOURCES/lalistunnel b/SOURCES/lalistunnel index 6ee0738..eec78c8 100755 --- a/SOURCES/lalistunnel +++ b/SOURCES/lalistunnel @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/sh ssh -p 10022 -N -f -R 6000:localhost:22 ssh@lalis69.ddns.net #ssh -N -f -R 6001:localhost:5900 ssh@82.225.210.60 'x11vnc -localhost -display :0' diff --git a/SOURCES/test.desktop b/SOURCES/test.desktop old mode 100755 new mode 100644 index f9af916..f27624c --- a/SOURCES/test.desktop +++ b/SOURCES/test.desktop @@ -1,6 +1,6 @@ [Desktop Entry] -Comment[fr_FR]=Outils de test et de inventaire matériel de LALIS -Comment=Inventory and test tool for LALIS +Comment[fr_FR]=Outils de test et de inventaire mat\xc3\xa9riel de LALIS +Comment=Outils de test et de inventaire mat\xc3\xa9riel de LALIS Exec=kate ./checklist.txt;kdesu -u root /usr/local/bin/sync_check.sh GenericName[fr_FR]=Test GenericName=Test diff --git a/SPECS/task-lalis.spec b/SPECS/task-lalis.spec index 7ce4f78..7f30b76 100755 --- a/SPECS/task-lalis.spec +++ b/SPECS/task-lalis.spec @@ -119,7 +119,7 @@ Requires: chromium-browser Requires: lshw %description -This task package installs LALIS choosen packages in mageia and some configurations. +This package installs LALIS choosen packages and some configurations. %install mkdir -p %{buildroot}/tmp/ @@ -130,10 +130,10 @@ cp -af %{SOURCE1} %{buildroot}/tmp/ cp -f %{SOURCE2} %{buildroot}/usr/local/bin/ cp -f %{SOURCE4} %{buildroot}/usr/local/bin/ cp -f %{SOURCE5} %{buildroot}/usr/local/bin/ -#cp -f %{SOURCE6} %{buildroot}/usr/local/bin/ cp -f %{SOURCE3} %{buildroot}/usr/share/kio_desktop/ cp -f %{SOURCE3} %{buildroot}/usr/share/dist/desktop-files/default/ - +cp -f %{SOURCE6} %{buildroot}/usr/share/dist/desktop-files/default/ +cp -f %{SOURCE7} %{buildroot}/usr/share/dist/desktop-files/default/ %files @@ -143,9 +143,8 @@ cp -f %{SOURCE3} %{buildroot}/usr/share/dist/desktop-files/default/ /usr/local/bin/lalistunnel /usr/local/bin/identPC.sh /usr/local/bin/sync_check.sh -#/usr/local/etc/checklist.txt /usr/share/kio_desktop/Lalis.desktop -/usr/share/dist/desktop-files/default +/usr/share/dist/desktop-files/default/* %post #desktop() @@ -171,18 +170,13 @@ fi #desktop /home/lalis if ! [ -d "/home/lalis/$DESKTOP" ]; then /usr/bin/mkdir "/home/lalis/$DESKTOP" - + fi -cp %{SOURCE7} /home/lalis/$DESKTOP/ -cp %{SOURCE6} /home/lalis/$DESKTOP/ +cp /usr/share/dist/desktop-files/default/checklist.txt /home/lalis/$DESKTOP/ +cp /usr/share/dist/desktop-files/default/test.desktop /home/lalis/$DESKTOP/ chown lalis:lalis -R /home/lalis -# met en exécution pour tout le monde les outils lalis -chmod a+x /usr/local/bin/%{SOURCE2} -chmod a+x /usr/local/bin/%{SOURCE4} -chmod a+x /usr/local/bin/%{SOURCE5} - # Copie le fichier Lalis.desktop dans les dossier utilisateurs existant cp -f /usr/share/kio_desktop/Lalis.desktop /usr/share/dist/desktop-files/default/ for i in /home/* @@ -194,9 +188,10 @@ do # desktop "/home/$i" if ! [ -d "$i/$DESKTOP" ]; then su -c "mkdir $i/Bureau" - "$USER" + echo "su -c mkdir $i/Bureau - $USER" fi cp -fa /usr/share/kio_desktop/Lalis.desktop "$i/$DESKTOP/" - chown $USER:$USER "$i/$DESKTOP/Lalis.desktop" + chown $USER:$USERESKTOP/Lalis.d "$i/$Desktop" fi fi done