1
0

correction de bug

This commit is contained in:
Daniel Tartavel 2020-04-20 19:31:44 +02:00
parent a20b52627a
commit 729a306c19

View File

@ -1,7 +1,7 @@
Summary: Install LALIS packages and configuration
Name: task-lalis
Version: 5.3
Release: %mkrel 1
Release: %mkrel 6
License: GPLv3
Group: Tools
Url: http://lalis.fr
@ -12,7 +12,7 @@ Source3: Lalis.desktop
Source4: identMM.pl
Source5: test.desktop
Source6: checklist.txt
Source7: simple-scan.mo.patch
#Source7: simple-scan.mo.patch
Source8: ssh_id_rsa
Source9: RPM-GPG-KEY-Lalis
Source10: lalis-i586.repo
@ -108,7 +108,6 @@ Requires: task-codec-audio
Requires: task-codec-video
Requires: x11vnc
Requires: kamoso
Requires: exfat-utils
Requires: simple-scan
Requires: kipi-plugins
Requires: gimp-plugin-bimp
@ -135,7 +134,8 @@ Requires: kwallet-pam
Requires: kpdftool
Requires: ktorrent
Requires: kdeconnect-kde
Requires: chromium-browser
Requires: chromium-browser-stable
Requires: nextcloud-client
Obsoletes: task-lalis < 4
%description minimal
@ -156,7 +156,7 @@ cp %{SOURCE3} %{buildroot}%{_datadir}/dist/desktop-files/default/
cp %{SOURCE5} %{buildroot}%{_datadir}/dist/desktop-files/default/
cp %{SOURCE1} %{buildroot}%{_datadir}/lalis/
cp %{SOURCE6} %{buildroot}%{_datadir}/lalis/
cp %{SOURCE7} %{buildroot}%{_datadir}/lalis/
#cp %{SOURCE7} %{buildroot}%{_datadir}/lalis/
cp %{SOURCE8} %{buildroot}%{_datadir}/lalis/
cp %{SOURCE9} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/
cp %{SOURCE10} %{buildroot}%{_sysconfdir}/yum.repos.d/
@ -206,13 +206,17 @@ fi
# Ajoute l'utilisateur lalis à la liste des utilisateurs autorisés à se connecter en ssh
if [ -z "`grep lalis /etc/ssh/sshd_config`" ]; then
echo "Allowusers lalis" >>/etc/ssh/sshd_config
if [ -z "`grep -i allowusers /etc/ssh/sshd_config`"]; then
echo "Allowusers lalis" >>/etc/ssh/sshd_config
else
sed -i -e 's/^Allowusers.*$/& lalis/g' /etc/ssh/sshd_config
fi
fi
/usr/bin/systemctl restart sshd
# Ajoute le fichier test.desktop sur le bureau de l'utilisateur lalis
desktop /home/lalis
echo $DESKTOP
if ! [ "$DESKTOP" = "" ]; then
if [ "$DESKTOP" = "" ]; then
/usr/bin/mkdir "/home/lalis/$DESKTOP"
fi
@ -221,7 +225,7 @@ chmod a+rw /usr/share/lalis/checklist.txt
cp /usr/share/dist/desktop-files/default/test.desktop /home/lalis/$DESKTOP/
chown lalis:lalis -R /home/lalis/$DESKTOP/test.desktop
# Copie le fichier Lalis.desktop dans le dossier /etc/skel
cp -f /usr/share/kio_desktop/Lalis.desktop /etc/$DESKTOP/
cp -f /usr/share/kio_desktop/Lalis.desktop /etc/skel/$DESKTOP
# Copie le fichier Lalis.desktop dans les dossier utilisateurs existant
cp -f /usr/share/kio_desktop/Lalis.desktop /usr/share/dist/desktop-files/default/