From d3cea205c2e6e272ea11e1989791b949c27106de Mon Sep 17 00:00:00 2001
From: "Ramón M. Gómez" <ramongomez@us.es>
Date: Tue, 21 Jan 2020 11:25:18 +0100
Subject: #951: Remove some fake error messages in import script.

---
 installer/opengnsys_import.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/installer/opengnsys_import.sh b/installer/opengnsys_import.sh
index 29d279e9..fb627883 100755
--- a/installer/opengnsys_import.sh
+++ b/installer/opengnsys_import.sh
@@ -312,7 +312,7 @@ done
 echo "   * Guardamos los ficheros PXE de los clientes."
 for BOOTLOADER in menu.lst grub; do
     if [ -d $TMPDIR/$BOOTLOADER ]; then
-        mkdir $OPENGNSYS/tftpboot/$BOOTLOADER-$DATE
+        mkdir -p $OPENGNSYS/tftpboot/$BOOTLOADER-$DATE
         mv $OPENGNSYS/tftpboot/$BOOTLOADER/{01-*,templates,examples} $OPENGNSYS/tftpboot/$BOOTLOADER-$DATE 2>/dev/null
         cp -r $TMPDIR/$BOOTLOADER/{01-*,templates,examples}  $OPENGNSYS/tftpboot/$BOOTLOADER 2>/dev/null
         chown -R www-data:www-data $OPENGNSYS/tftpboot/$BOOTLOADER
@@ -343,10 +343,10 @@ cp -r $TMPDIR/menus $OPENGNSYS/www
 # Script personalizados
 echo "   * Guardamos los scripts personalizados."
 if ls $OPENGNSYS/client/scripts/*Custom &>/dev/null; then
-    mkdir $OPENGNSYS/client/scripts/Custom-$DATE
+    mkdir -p $OPENGNSYS/client/scripts/Custom-$DATE
     mv $OPENGNSYS/client/scripts/*Custom $OPENGNSYS/client/scripts/Custom-$DATE
 fi
-cp -r $TMPDIR/*Custom $OPENGNSYS/client/scripts 
+cp -r $TMPDIR/*Custom $OPENGNSYS/client/scripts &>/dev/null
 
 echo -e "Se ha terminado de importar los datos del backup. \n\nSe han realizado copias de seguridad de los archivos antiguos:" 
 echo    "  - /etc/default/opengnsys-$DATE"
-- 
cgit v1.2.3-18-g5258