From 78a175795a8ba4541a7f213611835b1aea363441 Mon Sep 17 00:00:00 2001 From: Steve Clement Date: Fri, 8 Feb 2019 19:33:19 +0900 Subject: [PATCH] fix: [installer] -ne (== NOT EQUAL != NOT EXIST Grr...) --- INSTALL/INSTALL.debian.sh | 8 ++++---- INSTALL/INSTALL.debian.tpl.sh | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/INSTALL/INSTALL.debian.sh b/INSTALL/INSTALL.debian.sh index cc3f2a74a..8fbf1fa0f 100755 --- a/INSTALL/INSTALL.debian.sh +++ b/INSTALL/INSTALL.debian.sh @@ -739,7 +739,7 @@ updateGOWNT () { # Generate GnuPG key setupGnuPG () { - if [ -ne $PATH_TO_MISP/.gnupg ]; then + if [ ! -d $PATH_TO_MISP/.gnupg ]; then # The email address should match the one set in the config.php # set in the configuration menu in the administration menu configuration file echo "%echo Generating a default key @@ -1202,6 +1202,9 @@ installMISPonKali () { chown -R www-data:www-data $PATH_TO_MISP/app/Config chmod -R 750 $PATH_TO_MISP/app/Config + debug "Generating rc.local" + genRCLOCAL + debug "Setting up GnuPG" setupGnuPG @@ -1213,9 +1216,6 @@ installMISPonKali () { debug "Update: Galaxies, Template Objects, Warning Lists, Notice Lists, Taxonomies" updateGOWNT - debug "Generating rc.local" - genRCLOCAL - gitPullAllRCLOCAL debug "Installing misp-modules" diff --git a/INSTALL/INSTALL.debian.tpl.sh b/INSTALL/INSTALL.debian.tpl.sh index c687ef313..16f699aa2 100755 --- a/INSTALL/INSTALL.debian.tpl.sh +++ b/INSTALL/INSTALL.debian.tpl.sh @@ -322,6 +322,9 @@ installMISPonKali () { chown -R www-data:www-data $PATH_TO_MISP/app/Config chmod -R 750 $PATH_TO_MISP/app/Config + debug "Generating rc.local" + genRCLOCAL + debug "Setting up GnuPG" setupGnuPG @@ -333,9 +336,6 @@ installMISPonKali () { debug "Update: Galaxies, Template Objects, Warning Lists, Notice Lists, Taxonomies" updateGOWNT - debug "Generating rc.local" - genRCLOCAL - gitPullAllRCLOCAL debug "Installing misp-modules"