mirror of https://github.com/MISP/MISP
chg: [kali] Last tweaks to make sure all deps are present
parent
dc1637fb46
commit
7a57cecb98
|
@ -1559,10 +1559,10 @@ generateInstaller () {
|
|||
# Make sure no alias exists
|
||||
if [[ $(type -t debug) == "alias" ]]; then unalias debug; fi
|
||||
debug () {
|
||||
echo -e "${RED}Next step:${NC} ${GREEN}$1${NC}"
|
||||
echo -e "${RED}Next step:${NC} ${GREEN}$1${NC}" > /dev/tty
|
||||
if [ ! -z $DEBUG ]; then
|
||||
NO_PROGRESS=1
|
||||
echo -e "${RED}Debug Mode${NC}, press ${LBLUE}enter${NC} to continue..."
|
||||
echo -e "${RED}Debug Mode${NC}, press ${LBLUE}enter${NC} to continue..." > /dev/tty
|
||||
exec 3>&1
|
||||
read
|
||||
else
|
||||
|
@ -1577,6 +1577,9 @@ installMISPubuntuSupported () {
|
|||
echo "Proceeding with the installation of MISP core"
|
||||
space
|
||||
|
||||
debug "Checking Locale"
|
||||
checkLocale
|
||||
|
||||
# Set Base URL - functionLocation('generic/supportFunctions.md')
|
||||
[[ -n $CORE ]] || [[ -n $ALL ]] && setBaseURL
|
||||
progress 4
|
||||
|
@ -1704,18 +1707,24 @@ installMISPubuntuSupported () {
|
|||
installMISPonKali () {
|
||||
# Kali might have a bug on installs where libc6 is not up to date, this forces bash and libc to update - functionLocation('')
|
||||
kaliUpgrade 2> /dev/null > /dev/null
|
||||
|
||||
debug "Checking Locale"
|
||||
checkLocale
|
||||
# Install PHP 7.3 Dependencies - functionLocation('generic/supportFunctions.md')
|
||||
installDepsPhp73 2> /dev/null > /dev/null
|
||||
# Set custom Kali only variables and tweaks
|
||||
space
|
||||
# The following disables sleep on kali/gnome
|
||||
disableSleep 2> /dev/null > /dev/null
|
||||
debug "Sleeping 3 seconds to make sure the disable sleep does not confuse the execution of the script."
|
||||
sleep 3
|
||||
### FIXME: Disabling for now, maybe source of some issues.
|
||||
##disableSleep 2> /dev/null > /dev/null
|
||||
##debug "Sleeping 3 seconds to make sure the disable sleep does not confuse the execution of the script."
|
||||
##sleep 3
|
||||
|
||||
debug "Installing dependencies"
|
||||
installDeps 2> /dev/null > /dev/null
|
||||
|
||||
installCoreDeps 2> /dev/null > /dev/null
|
||||
|
||||
debug "Enabling redis and gnupg modules"
|
||||
phpenmod -v 7.3 redis
|
||||
phpenmod -v 7.3 gnupg
|
||||
|
|
|
@ -337,6 +337,8 @@ installMISPonKali () {
|
|||
debug "Installing dependencies"
|
||||
installDeps 2> /dev/null > /dev/null
|
||||
|
||||
installCoreDeps 2> /dev/null > /dev/null
|
||||
|
||||
debug "Enabling redis and gnupg modules"
|
||||
phpenmod -v 7.3 redis
|
||||
phpenmod -v 7.3 gnupg
|
||||
|
|
Loading…
Reference in New Issue