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

Fix script typos #7201

Merged
merged 3 commits into from Jan 25, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cms/utils/__init__.py
@@ -1,4 +1,4 @@
# TODO: this is just stuff from utils.py - should be splitted / moved
# TODO: this is just stuff from utils.py - should be split / moved
from django.conf import settings
from django.core.files.storage import get_storage_class
from django.utils.functional import LazyObject
Expand Down
12 changes: 6 additions & 6 deletions scripts/functions
@@ -1,6 +1,6 @@
#!/bin/bash

# This script gather common fonctions for all scripts
# This script gather common functions for all scripts


RED="\033[31;1m"
Expand All @@ -13,9 +13,9 @@ if [ -z "${EDITOR}" ]; then
EDITOR=vim
fi

###############################################################################
# Status reportinng (echo with colors) #
###############################################################################
##############################################################################
# Status reporting (echo with colors) #
##############################################################################

#
# show a progress status
Expand Down Expand Up @@ -89,7 +89,7 @@ load_nvm() {
exit 1
fi

if [ ! -s "$NVM_DIR/nvm.sh" ]; then
if [ ! -s "$NVM_DIR/nvm.sh" ]; then
error "Can not find nvm script, please install NVM first"
echo "to install nvm:"
echo "curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash"
Expand Down Expand Up @@ -154,5 +154,5 @@ check_virtual_env() {
exit 1
fi


}
2 changes: 1 addition & 1 deletion scripts/make-changelog
Expand Up @@ -146,7 +146,7 @@ r${content}
rm "${content}"
done

# generating statistics
# generating statistics

PR_NUMBER=$(git log --pretty=oneline "${OLD_FULL_VERSION}.." | wc -l)

Expand Down
2 changes: 1 addition & 1 deletion scripts/make-release
Expand Up @@ -205,7 +205,7 @@ status "- Fetching strings from transifex"
"${SCRIPTS}/transifex-pull-strings"

# Before compiling:
# ignore changesets that only involeves "^POT-Creation-Date:" "^PO-Revision-Date:"
# ignore changesets that only involves "^POT-Creation-Date:" "^PO-Revision-Date:"
git diff-index --quiet HEAD locale || git commit locale -m "${COMMIT_PREFIX}compilemessages"
cd ..

Expand Down