From ac42d4a12e138e3327623e9e8071a259b027a134 Mon Sep 17 00:00:00 2001 From: Daniel Tartavel Date: Tue, 26 Mar 2019 21:35:16 +0100 Subject: [PATCH] debuggage --- SOURCES/identPC.sh | 2 +- SOURCES/sync_check.sh | 9 +++++++-- SPECS/task-lalis.spec | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/SOURCES/identPC.sh b/SOURCES/identPC.sh index 2a04276..214987e 100755 --- a/SOURCES/identPC.sh +++ b/SOURCES/identPC.sh @@ -1,7 +1,7 @@ #!/usr/bin/bash ######### Script d'etablissement de la fiche technique d'un PC ######### -FILE="identification.txt" +FILE="$DESKTOP/identification.txt" usage() { echo ' Usage:' diff --git a/SOURCES/sync_check.sh b/SOURCES/sync_check.sh index a3041f7..d04c4ce 100755 --- a/SOURCES/sync_check.sh +++ b/SOURCES/sync_check.sh @@ -1,5 +1,10 @@ #!/usr/bin/sh -#./identPC.sh + +DESKTOP=`grep XDG_DESKTOP_DIR $1/.config/user-dirs.dirs` +DESKTOP=${DESKTOP##*} +export $DESKTOP + +./identPC.sh /usr/bin/kate ./checklist.txt grep -is -m 2 "numéro de série" ./identification.txt >tmp.txt while read LIGNE @@ -15,4 +20,4 @@ do done < tmp.txt rm -f tmp.txt mkdir $DIRNAME -rsync --port 10073 -aP *.txt "lalis69.ddns.net::lalis-ordis/$DIRNAME" +rsync --port 10073 -aP $DESKTOP/*.txt "lalis69.ddns.net::lalis-ordis/$DIRNAME" diff --git a/SPECS/task-lalis.spec b/SPECS/task-lalis.spec index 20f09d9..801a9ad 100755 --- a/SPECS/task-lalis.spec +++ b/SPECS/task-lalis.spec @@ -1,6 +1,6 @@ Summary: Install LALIS packages and configuration Name: task-lalis -Version: 2 +Version: 2.1 Release: %mkrel 1 License: GPLv3 Group: Tools @@ -13,6 +13,7 @@ Source4: identPC.sh Source5: sync_check.sh Source6: checklist.txt Source7: test.desktop +Requires: kate Requires: openssh-server Requires: sshfs-fuse Requires: celestia