Skip to content
This repository has been archived by the owner on Aug 15, 2023. It is now read-only.

Commit

Permalink
fix #26 remove --show-progress from the shell scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
jpylypiw committed Feb 17, 2021
1 parent a95df0c commit bda0d33
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions scripts/install-web.sh
Expand Up @@ -69,23 +69,23 @@ echo "" && echo -e "\\e[33m($STEP/$STEPS)\\e[32m Download of several libraries r
mkdir "$TMPDIR" && cd "$TMPDIR" || exit 1

# Bootstrap
wget -q --timeout=10 --tries=5 --retry-connrefused --show-progress "https://stackpath.bootstrapcdn.com/bootstrap/$BOOTSTRAP/css/bootstrap.min.css" && cp -v "bootstrap.min.css" "$WEBDIR/static/css/"
wget -q --timeout=10 --tries=5 --retry-connrefused --show-progress "https://stackpath.bootstrapcdn.com/bootstrap/$BOOTSTRAP/css/bootstrap.min.css.map" && cp -v "bootstrap.min.css.map" "$WEBDIR/static/css/"
wget -q --timeout=10 --tries=5 --retry-connrefused --show-progress "https://stackpath.bootstrapcdn.com/bootstrap/$BOOTSTRAP/js/bootstrap.min.js" && cp -v "bootstrap.min.js" "$WEBDIR/static/js/"
wget -q --timeout=10 --tries=5 --retry-connrefused --show-progress "https://stackpath.bootstrapcdn.com/bootstrap/$BOOTSTRAP/js/bootstrap.min.js.map" && cp -v "bootstrap.min.js.map" "$WEBDIR/static/js/"
wget -q --timeout=10 --tries=5 --retry-connrefused "https://stackpath.bootstrapcdn.com/bootstrap/$BOOTSTRAP/css/bootstrap.min.css" && cp -v "bootstrap.min.css" "$WEBDIR/static/css/"
wget -q --timeout=10 --tries=5 --retry-connrefused "https://stackpath.bootstrapcdn.com/bootstrap/$BOOTSTRAP/css/bootstrap.min.css.map" && cp -v "bootstrap.min.css.map" "$WEBDIR/static/css/"
wget -q --timeout=10 --tries=5 --retry-connrefused "https://stackpath.bootstrapcdn.com/bootstrap/$BOOTSTRAP/js/bootstrap.min.js" && cp -v "bootstrap.min.js" "$WEBDIR/static/js/"
wget -q --timeout=10 --tries=5 --retry-connrefused "https://stackpath.bootstrapcdn.com/bootstrap/$BOOTSTRAP/js/bootstrap.min.js.map" && cp -v "bootstrap.min.js.map" "$WEBDIR/static/js/"

# Font Awesome
wget -q --timeout=10 --tries=5 --retry-connrefused --show-progress "https://fontawesome.com/v$FONTAWESOME/assets/font-awesome-$FONTAWESOME.zip"
wget -q --timeout=10 --tries=5 --retry-connrefused "https://fontawesome.com/v$FONTAWESOME/assets/font-awesome-$FONTAWESOME.zip"
unzip -q "font-awesome-$FONTAWESOME.zip"
cp -rv "font-awesome-$FONTAWESOME/css/"* "$WEBDIR/static/css/"
cp -rv "font-awesome-$FONTAWESOME/fonts/"* "$WEBDIR/static/fonts/"

# JQuery Slim (for Bootstrap)
wget -q --timeout=10 --tries=5 --retry-connrefused --show-progress "https://code.jquery.com/jquery-$JQUERY.slim.min.js" && cp -v jquery-$JQUERY.slim.min.js "$WEBDIR/static/js/"
wget -q --timeout=10 --tries=5 --retry-connrefused "https://code.jquery.com/jquery-$JQUERY.slim.min.js" && cp -v jquery-$JQUERY.slim.min.js "$WEBDIR/static/js/"

# Popper (for Bootstrap)
wget -q --timeout=10 --tries=5 --retry-connrefused --show-progress "https://cdnjs.cloudflare.com/ajax/libs/popper.js/$POPPER/umd/popper.min.js" && cp -v popper.min.js "$WEBDIR/static/js/"
wget -q --timeout=10 --tries=5 --retry-connrefused --show-progress "https://cdnjs.cloudflare.com/ajax/libs/popper.js/$POPPER/umd/popper.min.js.map" && cp -v popper.min.js.map "$WEBDIR/static/js/"
wget -q --timeout=10 --tries=5 --retry-connrefused "https://cdnjs.cloudflare.com/ajax/libs/popper.js/$POPPER/umd/popper.min.js" && cp -v popper.min.js "$WEBDIR/static/js/"
wget -q --timeout=10 --tries=5 --retry-connrefused "https://cdnjs.cloudflare.com/ajax/libs/popper.js/$POPPER/umd/popper.min.js.map" && cp -v popper.min.js.map "$WEBDIR/static/js/"

cd "$HOMEPATH" || exit 1
rm -rf "$TMPDIR"
Expand Down
2 changes: 1 addition & 1 deletion scripts/update.sh
Expand Up @@ -43,7 +43,7 @@ rm -rf "${NEWPATH}"
# Step 2
echo "" && echo -e "\\e[33m($STEP/$STEPS)\\e[32m Download the new program version into a new folder \\e[39m" && ((STEP++))
mkdir -p "${NEWPATH}"
wget -q --timeout=10 --tries=5 --retry-connrefused --show-progress -P "${NEWPATH}" "${GIT_URL}"
wget -q --timeout=10 --tries=5 --retry-connrefused -P "${NEWPATH}" "${GIT_URL}"

# Step 3
echo "" && echo -e "\\e[33m($STEP/$STEPS)\\e[32m Unpack the new program version \\e[39m" && ((STEP++))
Expand Down

0 comments on commit bda0d33

Please sign in to comment.