skip couple steps from installation if XOUSER is root since this variable is nowadays always set

This commit is contained in:
ronivay
2020-04-04 20:53:53 +03:00
parent 26f0bcd858
commit d983287b04

View File

@@ -274,7 +274,7 @@ function InstallXO {
# Create user if doesn't exist (if defined) # Create user if doesn't exist (if defined)
if [ $XOUSER ]; then if [[ "$XOUSER" != "root" ]]; then
if [[ -z $(getent passwd $XOUSER) ]]; then if [[ -z $(getent passwd $XOUSER) ]]; then
echo echo
echo -ne "${PROGRESS} Creating missing $XOUSER user" echo -ne "${PROGRESS} Creating missing $XOUSER user"
@@ -454,7 +454,7 @@ function InstallXO {
echo -e "${INFO} Symlinking fresh xo-web install/update to $INSTALLDIR/xo-web" echo -e "${INFO} Symlinking fresh xo-web install/update to $INSTALLDIR/xo-web"
ln -sfn $INSTALLDIR/xo-builds/xen-orchestra-$TIME/packages/xo-web $INSTALLDIR/xo-web ln -sfn $INSTALLDIR/xo-builds/xen-orchestra-$TIME/packages/xo-web $INSTALLDIR/xo-web
if [ $XOUSER ]; then if [[ "$XOUSER" != "root" ]]; then
chown -R $XOUSER:$XOUSER $INSTALLDIR/xo-builds/xen-orchestra-$TIME chown -R $XOUSER:$XOUSER $INSTALLDIR/xo-builds/xen-orchestra-$TIME
if [ ! -d /var/lib/xo-server ]; then if [ ! -d /var/lib/xo-server ]; then