mirror/XenOrchestraInstallerUpdater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor output modifications

Browse Source
This commit is contained in:
ronivay
2020-05-30 20:58:15 +03:00
parent 2f5b500ad0
commit 188bbf1de1
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
xo-install.sh
View File

@@ -374,6 +374,7 @@ function InstallXO {
# Create installation directory if doesn't exist already # Create installation directory if doesn't exist already
if [[ ! -d "$INSTALLDIR" ]] ; then if [[ ! -d "$INSTALLDIR" ]] ; then
echo
echo -ne "${PROGRESS} Creating missing basedir to $INSTALLDIR" echo -ne "${PROGRESS} Creating missing basedir to $INSTALLDIR"
cmdlog "mkdir -p \"$INSTALLDIR\"" cmdlog "mkdir -p \"$INSTALLDIR\""
mkdir -p "$INSTALLDIR" mkdir -p "$INSTALLDIR"
@@ -382,6 +383,7 @@ function InstallXO {
# Create missing xo-builds directory if doesn't exist already # Create missing xo-builds directory if doesn't exist already
if [[ ! -d "$INSTALLDIR/xo-builds" ]]; then if [[ ! -d "$INSTALLDIR/xo-builds" ]]; then
echo
echo -ne "${PROGRESS} Creating missing xo-builds directory to $INSTALLDIR/xo-builds" echo -ne "${PROGRESS} Creating missing xo-builds directory to $INSTALLDIR/xo-builds"
cmdlog "mkdir \"$INSTALLDIR/xo-builds\"" cmdlog "mkdir \"$INSTALLDIR/xo-builds\""
mkdir "$INSTALLDIR/xo-builds" mkdir "$INSTALLDIR/xo-builds"
@@ -390,7 +392,6 @@ function InstallXO {
echo echo
echo -e "${INFO} Fetching Xen Orchestra source code" echo -e "${INFO} Fetching Xen Orchestra source code"
echo
if [[ ! -d "$XO_SRC_DIR" ]]; then if [[ ! -d "$XO_SRC_DIR" ]]; then
cmdlog "mkdir -p \"$XO_SRC_DIR\"" cmdlog "mkdir -p \"$XO_SRC_DIR\""
mkdir -p "$XO_SRC_DIR" mkdir -p "$XO_SRC_DIR"
@@ -495,6 +496,7 @@ function InstallXO {
echo -e "${INFO} Updating xen-orchestra from '$OLD_REPO_HASH_SHORT' to '$NEW_REPO_HASH_SHORT'" echo -e "${INFO} Updating xen-orchestra from '$OLD_REPO_HASH_SHORT' to '$NEW_REPO_HASH_SHORT'"
fi fi
echo
echo echo
echo -e "${INFO} xo-server and xo-web build quite a while. Grab a cup of coffee and lay back" echo -e "${INFO} xo-server and xo-web build quite a while. Grab a cup of coffee and lay back"
echo echo
@@ -510,7 +512,6 @@ function InstallXO {
echo -e "${INFO} Fixing binary path in systemd service configuration file" echo -e "${INFO} Fixing binary path in systemd service configuration file"
cmdlog "sed -i \"s#ExecStart=.*#ExecStart=$INSTALLDIR\/xo-server\/bin\/xo-server#\" $INSTALLDIR/xo-builds/xen-orchestra-$TIME/packages/xo-server/xo-server.service" cmdlog "sed -i \"s#ExecStart=.*#ExecStart=$INSTALLDIR\/xo-server\/bin\/xo-server#\" $INSTALLDIR/xo-builds/xen-orchestra-$TIME/packages/xo-server/xo-server.service"
sed -i "s#ExecStart=.*#ExecStart=$INSTALLDIR\/xo-server\/bin\/xo-server#" $INSTALLDIR/xo-builds/xen-orchestra-$TIME/packages/xo-server/xo-server.service sed -i "s#ExecStart=.*#ExecStart=$INSTALLDIR\/xo-server\/bin\/xo-server#" $INSTALLDIR/xo-builds/xen-orchestra-$TIME/packages/xo-server/xo-server.service
echo
echo -e "${INFO} Adding WorkingDirectory parameter to systemd service configuration file" echo -e "${INFO} Adding WorkingDirectory parameter to systemd service configuration file"
cmdlog "sed -i \"/ExecStart=.*/a WorkingDirectory=$INSTALLDIR/xo-server\" $INSTALLDIR/xo-builds/xen-orchestra-$TIME/packages/xo-server/xo-server.service" cmdlog "sed -i \"/ExecStart=.*/a WorkingDirectory=$INSTALLDIR/xo-server\" $INSTALLDIR/xo-builds/xen-orchestra-$TIME/packages/xo-server/xo-server.service"
sed -i "/ExecStart=.*/a WorkingDirectory=$INSTALLDIR/xo-server" $INSTALLDIR/xo-builds/xen-orchestra-$TIME/packages/xo-server/xo-server.service >>$LOGFILE 2>&1 sed -i "/ExecStart=.*/a WorkingDirectory=$INSTALLDIR/xo-server" $INSTALLDIR/xo-builds/xen-orchestra-$TIME/packages/xo-server/xo-server.service >>$LOGFILE 2>&1