fix(core): correctly check for docker this time
This commit is contained in:
parent
26eb65dc13
commit
2394c2c430
1 changed files with 4 additions and 3 deletions
|
@ -24,9 +24,8 @@ if [[ $_FOLDER != "" ]]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check for panels that are using Docker.
|
# Check for panels that are using Docker.
|
||||||
if [[ -f ".dockerenv" ]]; then
|
if [[ -f "/.dockerenv" ]]; then
|
||||||
DOCKER="y"
|
DOCKER="y"
|
||||||
FOLDER="/var/www/html"
|
|
||||||
else
|
else
|
||||||
DOCKER="n"
|
DOCKER="n"
|
||||||
fi
|
fi
|
||||||
|
@ -1334,7 +1333,9 @@ if [[ $2 == "-upgrade" ]]; then VCMD="y"
|
||||||
bash tools/update.sh ${FOLDER}
|
bash tools/update.sh ${FOLDER}
|
||||||
fi
|
fi
|
||||||
chmod +x blueprint.sh
|
chmod +x blueprint.sh
|
||||||
_FOLDER="${FOLDER}" bash blueprint.sh --post-upgrade
|
sed -i -E "s|FOLDER=\"/var/www/pterodactyl\" #;|FOLDER=\"$FOLDER\" #;|g" $FOLDER/blueprint.sh
|
||||||
|
mv $FOLDER/blueprint $FOLDER/.blueprint;
|
||||||
|
bash blueprint.sh --post-upgrade
|
||||||
log_bright "[INFO] Bash might spit out some errors from here on out. Unexpected end of file (eof), command not found and syntax errors are expected behaviour."
|
log_bright "[INFO] Bash might spit out some errors from here on out. Unexpected end of file (eof), command not found and syntax errors are expected behaviour."
|
||||||
log_blue "[INPUT] Do you want to migrate your database? (Y/n)"
|
log_blue "[INPUT] Do you want to migrate your database? (Y/n)"
|
||||||
read -r YN4
|
read -r YN4
|
||||||
|
|
Loading…
Reference in a new issue