pull/1/head
Dominik Dzienia 2 years ago
parent 5cf8348d1b
commit 2aeb9b2502

@ -272,6 +272,7 @@ exit_on_no_cancel() {
setup_users() { setup_users() {
id -u mongodb &>/dev/null id -u mongodb &>/dev/null
RESULT=$?
if [ $RESULT -eq 0 ]; then if [ $RESULT -eq 0 ]; then
msgcheck "Mongo DB user detected" msgcheck "Mongo DB user detected"
else else
@ -305,7 +306,12 @@ install_containers() {
install_containers_progress() { install_containers_progress() {
created=$(docker container ls -f 'status=created' -f name=ns-server -f name=ns-database | wc -l) created=$(docker container ls -f 'status=created' -f name=ns-server -f name=ns-database | wc -l)
current=$(docker container ls -f 'status=running' -f name=ns-server -f name=ns-database | wc -l) current=$(docker container ls -f 'status=running' -f name=ns-server -f name=ns-database | wc -l)
echo $(( ((($current-1)*2 + ($created-1) )*100 / 6) )) progr=$(( ($current-1)*2 + ($created-1) ))
if [ "$progr" -eq "0" ]; then
echo $1
else
echo $(( ($progr*50 / 6)+50 ))
fi
} }
uninstall_containers() { uninstall_containers() {
@ -489,8 +495,8 @@ processgauge(){
while true; do while true; do
echo 0 echo 0
while kill -0 "$thepid" >/dev/null 2>&1; do while kill -0 "$thepid" >/dev/null 2>&1; do
if [[ $num -gt 97 ]] ; then num=1; fi if [[ $num -gt 50 ]] ; then num=50; fi
eval $2 eval $2 $num
num=$((num+1)) num=$((num+1))
sleep 0.3 sleep 0.3
done done

@ -269,6 +269,7 @@ exit_on_no_cancel() {
setup_users() { setup_users() {
id -u mongodb &>/dev/null id -u mongodb &>/dev/null
RESULT=$?
if [ $RESULT -eq 0 ]; then if [ $RESULT -eq 0 ]; then
msgcheck "Mongo DB user detected" msgcheck "Mongo DB user detected"
else else
@ -302,7 +303,12 @@ install_containers() {
install_containers_progress() { install_containers_progress() {
created=$(docker container ls -f 'status=created' -f name=ns-server -f name=ns-database | wc -l) created=$(docker container ls -f 'status=created' -f name=ns-server -f name=ns-database | wc -l)
current=$(docker container ls -f 'status=running' -f name=ns-server -f name=ns-database | wc -l) current=$(docker container ls -f 'status=running' -f name=ns-server -f name=ns-database | wc -l)
echo $(( ((($current-1)*2 + ($created-1) )*100 / 6) )) progr=$(( ($current-1)*2 + ($created-1) ))
if [ "$progr" -eq "0" ]; then
echo $1
else
echo $(( ($progr*50 / 6)+50 ))
fi
} }
uninstall_containers() { uninstall_containers() {
@ -486,8 +492,8 @@ processgauge(){
while true; do while true; do
echo 0 echo 0
while kill -0 "$thepid" >/dev/null 2>&1; do while kill -0 "$thepid" >/dev/null 2>&1; do
if [[ $num -gt 97 ]] ; then num=1; fi if [[ $num -gt 50 ]] ; then num=50; fi
eval $2 eval $2 $num
num=$((num+1)) num=$((num+1))
sleep 0.3 sleep 0.3
done done

Loading…
Cancel
Save