Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove newlines from echo #169

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions server-pro/startup.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ verify_installation(){
echo "==VERIFY INSTALLATION==";
mkdir -p $DIAGNOSTIC_DIR
chmod 777 $DIAGNOSTIC_DIR
rstudio-server verify-installation --verify-user=$RSP_TESTUSER | tee $DIAGNOSTIC_DIR/verify.log
rstudio-server verify-installation --verify-user=$RSP_TESTUSER | tee $DIAGNOSTIC_DIR/verify.log
}

# touch log files to initialize them
Expand Down Expand Up @@ -65,7 +65,7 @@ else
echo "Empty 'RSP_TESTUSER' variables, not creating test user";
else
useradd -m -s /bin/bash -N -u $RSP_TESTUSER_UID $RSP_TESTUSER
echo "$RSP_TESTUSER:$RSP_TESTUSER_PASSWD" | sudo chpasswd
echo -n "$RSP_TESTUSER:$RSP_TESTUSER_PASSWD" | sudo chpasswd
fi
fi

Expand All @@ -77,7 +77,7 @@ fi

# Check diagnostic configurations
if [ "$DIAGNOSTIC_ENABLE" == "true" ]; then
verify_installation
verify_installation
if [ "$DIAGNOSTIC_ONLY" == "true" ]; then
echo $(<$DIAGNOSTIC_DIR/verify.log);
echo "Exiting script because DIAGNOSTIC_ONLY=${DIAGNOSTIC_ONLY}";
Expand Down