fix: [installer] Installer was broken, now fixed

pull/6118/head
Steve Clement 2020-07-15 04:14:19 +09:00
parent 02012e3881
commit 8bbce5bdf8
No known key found for this signature in database
GPG Key ID: 69A20F509BE4AEE9
6 changed files with 11 additions and 9 deletions

View File

@ -241,6 +241,7 @@ setOpt () {
("-U") echo "upgrade"; UPGRADE=1 ;;
("-N") echo "nuke"; NUKE=1 ;;
("-u") echo "unattended"; UNATTENDED=1 ;;
("-ni") echo "noninteractive"; NONINTERACTIVE=1 ;;
("-f") echo "force"; FORCE=1 ;;
(*) echo "$o is not a valid argument"; exit 1 ;;
esac
@ -1895,8 +1896,9 @@ mail2misp () {
cd /usr/local/src/
sudo apt-get install cmake libcaca-dev liblua5.3-dev -y
false; while [[ $? -ne 0 ]]; do $SUDO_CMD git clone https://github.com/MISP/mail_to_misp.git; done
[[ ! -d "faup" ]] && false; while [[ $? -ne 0 ]]; do $SUDO_CMD git clone git://github.com/stricaud/faup.git faup; done
[[ ! -d "gtcaca" ]] && false; while [[ $? -ne 0 ]]; do $SUDO_CMD git clone git://github.com/stricaud/gtcaca.git gtcaca; done
## TODO: The below fails miserably (obviously) if faup/gtcac dirs exist, let's just make the dangerous assumption (for the sake of the installer, that they exist)
##[[ ! -d "faup" ]] && false; while [[ $? -ne 0 ]]; do $SUDO_CMD git clone git://github.com/stricaud/faup.git faup; done
##[[ ! -d "gtcaca" ]] && false; while [[ $? -ne 0 ]]; do $SUDO_CMD git clone git://github.com/stricaud/gtcaca.git gtcaca; done
sudo chown -R ${MISP_USER}:${MISP_USER} faup mail_to_misp gtcaca
cd gtcaca
$SUDO_CMD mkdir -p build

View File

@ -1,5 +1,5 @@
; Generated by RHash v1.3.8 on 2020-07-14 at 00:16.53
; Generated by RHash v1.3.8 on 2020-07-15 at 04:14.11
; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/
;
; 133682 00:16.53 2020-07-14 INSTALL.sh
INSTALL.sh 21C8C020434D4EE255FE6D036D06FA560F1C796F DF9FB13E430BC62D6DD59DC41C1DD500FC2D9ABB1E3D2566CD3C39C4FFA39495 919B195713BFBAB7194CB96AE74FF0B1A0A15CFF74A6F10E6B58FBDD100E9B2B8205F66D12E6CB3C68CF2154A9E3DBF9 8182EB20BF5C842A7B7BC9C345A5E92CDDDA6AD9FB806AF1D3FC64475CF89648547019FF486FF6668794AB1EAEFAA2B242CE9E3346BDED73E38787C3CBBC67C0
; 133908 04:14.11 2020-07-15 INSTALL.sh
INSTALL.sh 1048857D0C71A2FB6029A448090BC88E008AA499 2E3E878D35568521B5DEC1E7F6DA3193FE3C51049E4BCC127068659E5375939E ED7092DC612C51D7B81969418B4EEA90CE5E990DDE693A3CE83566DEC11E1CF456452DCF103689F05B7E6CCB63F9BC45 2D4CC5D6E02135B337541CE00CDDB205E10EDE924B89B1EEFE069DD1FCE7CE552970AB65A7342838A3BB41E0DCDAB6460E7F96AB7F63EA554D9A1DB61116AE2A

View File

@ -1 +1 @@
21c8c020434d4ee255fe6d036d06fa560f1c796f INSTALL.sh
1048857d0c71a2fb6029a448090bc88e008aa499 INSTALL.sh

View File

@ -1 +1 @@
df9fb13e430bc62d6dd59dc41c1dd500fc2d9abb1e3d2566cd3c39c4ffa39495 INSTALL.sh
2e3e878d35568521b5dec1e7f6da3193fe3c51049e4bcc127068659e5375939e INSTALL.sh

View File

@ -1 +1 @@
919b195713bfbab7194cb96ae74ff0b1a0a15cff74a6f10e6b58fbdd100e9b2b8205f66d12e6cb3c68cf2154a9e3dbf9 INSTALL.sh
ed7092dc612c51d7b81969418b4eea90ce5e990dde693a3ce83566dec11e1cf456452dcf103689f05b7e6ccb63f9bc45 INSTALL.sh

View File

@ -1 +1 @@
8182eb20bf5c842a7b7bc9c345a5e92cddda6ad9fb806af1d3fc64475cf89648547019ff486ff6668794ab1eaefaa2b242ce9e3346bded73e38787c3cbbc67c0 INSTALL.sh
2d4cc5d6e02135b337541ce00cddb205e10ede924b89b1eefe069dd1fce7ce552970ab65a7342838a3bb41e0dcdab6460e7f96ab7f63ea554d9a1db61116ae2a INSTALL.sh