Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve shell quoting hygiene 

Most of these problems were found by ShellCheck
(http://www.shellcheck.net).

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg 2015-09-25 21:47:30 -04:00
parent 6888826d5b
commit 0d12dfd06f
23 changed files with 81 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/write-rabbitmq-consumers-state-file
View File

@ -11,5 +11,5 @@ ZULIP_DIR=/home/zulip/deployments/current
STATE_DIR=/var/lib/nagios_state STATE_DIR=/var/lib/nagios_state
STATE_FILE=$STATE_DIR/check-rabbitmq-consumers-$queue STATE_FILE=$STATE_DIR/check-rabbitmq-consumers-$queue
$ZULIP_DIR/bots/check-rabbitmq-consumers --queue=$queue &> ${STATE_FILE}-tmp; "$ZULIP_DIR/bots/check-rabbitmq-consumers" "--queue=$queue" &> "${STATE_FILE}-tmp";
mv ${STATE_FILE}-tmp $STATE_FILE mv "${STATE_FILE}-tmp" "$STATE_FILE"

2
puppet/zulip_internal/files/munin-plugins/humbug_send_receive
View File

@ -4,4 +4,4 @@ if [ "$(hostname)" = "staging.zulip.net" ]; then
else else
site="https://api.zulip.com" site="https://api.zulip.com"
fi fi
/home/zulip/deployments/current/bots/check_send_receive.py --munin $1 --site="$site" /home/zulip/deployments/current/bots/check_send_receive.py --munin "$1" --site="$site"

4
puppet/zulip_internal/files/nagios_plugins/check_email_deliverer_backlog
View File

@ -9,11 +9,11 @@ cd /home/zulip/deployments/current
BACKLOG=$(./manage.py print_email_delivery_backlog) BACKLOG=$(./manage.py print_email_delivery_backlog)
if [ $BACKLOG -gt 0 -a $BACKLOG -lt 10 ] if [ "$BACKLOG" -gt 0 ] && [ "$BACKLOG" -lt 10 ]
then then
echo "backlog of $BACKLOG" echo "backlog of $BACKLOG"
exit 1 exit 1
elif [ $BACKLOG -ge 10 ] elif [ "$BACKLOG" -ge 10 ]
then then
echo "backlog of $BACKLOG" echo "backlog of $BACKLOG"
exit 2 exit 2

6
puppet/zulip_internal/files/nagios_plugins/check_email_deliverer_process
View File

@ -13,14 +13,14 @@ if [ "$STATUS" == "RUNNING" ]
then then
echo "Running" echo "Running"
exit 0 exit 0
elif [ $(echo "$STATUS" | egrep '(STOPPED)|(STARTING)|(BACKOFF)|(STOPPING)|(EXITED)|(FATAL)|(UNKNOWN)$') ] elif [ "$(echo "$STATUS" | egrep '(STOPPED)|(STARTING)|(BACKOFF)|(STOPPING)|(EXITED)|(FATAL)|(UNKNOWN)$')" ]
then then
# not "RUNNING", but a recognized supervisor status # not "RUNNING", but a recognized supervisor status
echo $STATUS echo "$STATUS"
exit 1 exit 1
else else
# we don't recognize the second column in this SUPERVISOR_STATUS. # we don't recognize the second column in this SUPERVISOR_STATUS.
# This may be indicative of a supervisor configuration problem # This may be indicative of a supervisor configuration problem
echo $SUPERVISOR_STATUS echo "$SUPERVISOR_STATUS"
exit 3 exit 3
fi fi

2
puppet/zulip_internal/files/nagios_plugins/check_worker_memory
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Checks for any Zulip queue workers that are leaking memory and thus have a high vsize # Checks for any Zulip queue workers that are leaking memory and thus have a high vsize
datafile=$(mktemp) datafile=$(mktemp)
ps -o vsize,size,pid,user,command --sort -vsize $(pgrep -f '^python /home/zulip/deployments/current/manage.py process_queue') > "$datafile" ps -o vsize,size,pid,user,command --sort -vsize "$(pgrep -f '^python /home/zulip/deployments/current/manage.py process_queue')" > "$datafile"
cat "$datafile" cat "$datafile"
top_worker=$(cat "$datafile" | head -n2 | tail -n1) top_worker=$(cat "$datafile" | head -n2 | tail -n1)
top_worker_memory_usage=$(echo "$top_worker" | cut -f1 -d" ") top_worker_memory_usage=$(echo "$top_worker" | cut -f1 -d" ")

4
puppet/zulip_internal/files/postgresql/env-wal-e
View File

@ -5,9 +5,9 @@ fi
export AWS_ACCESS_KEY_ID=xxxxxxxxxxxxxxxxxxxx export AWS_ACCESS_KEY_ID=xxxxxxxxxxxxxxxxxxxx
export AWS_SECRET_ACCESS_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx export AWS_SECRET_ACCESS_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
s3_backup_bucket=$(crudini --get $ZULIP_CONF database s3_backup_bucket 2>&1) s3_backup_bucket=$(crudini --get "$ZULIP_CONF" database s3_backup_bucket 2>&1)
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Could not determine which s3 bucket to use:" $s3_backup_bucket echo "Could not determine which s3 bucket to use:" "$s3_backup_bucket"
exit 1 exit 1
fi fi
export WALE_S3_PREFIX=s3://$s3_backup_bucket export WALE_S3_PREFIX=s3://$s3_backup_bucket

4
scripts/setup/configure-rabbitmq
View File

@ -3,9 +3,9 @@
# Delete the "guest" default user and replace it with a Zulip user # Delete the "guest" default user and replace it with a Zulip user
# with a real password # with a real password
RMQPW=$($(dirname $0)/../../bin/get-django-setting RABBITMQ_PASSWORD) RMQPW=$("$(dirname "$0")/../../bin/get-django-setting" RABBITMQ_PASSWORD)
sudo rabbitmqctl delete_user zulip || true sudo rabbitmqctl delete_user zulip || true
sudo rabbitmqctl delete_user guest || true sudo rabbitmqctl delete_user guest || true
sudo rabbitmqctl add_user zulip $RMQPW sudo rabbitmqctl add_user zulip "$RMQPW"
sudo rabbitmqctl set_user_tags zulip administrator sudo rabbitmqctl set_user_tags zulip administrator
sudo rabbitmqctl set_permissions -p / zulip '.*' '.*' '.*' sudo rabbitmqctl set_permissions -p / zulip '.*' '.*' '.*'

2
scripts/setup/initialize-database
View File

@ -1,7 +1,7 @@
#!/bin/bash -xe #!/bin/bash -xe
# Change to root directory of the checkout that we're running from # Change to root directory of the checkout that we're running from
cd $(dirname $0)/../.. cd "$(dirname "$0")/../.."
python manage.py checkconfig python manage.py checkconfig

2
scripts/setup/install
View File

@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
mkdir -p /var/log/zulip mkdir -p /var/log/zulip
$(dirname $(dirname $0))/lib/install "$@" 2>&1 | tee -a /var/log/zulip/install.log "$(dirname "$(dirname "$0")")/lib/install" "$@" 2>&1 | tee -a /var/log/zulip/install.log

2
scripts/upgrade-zulip
View File

@ -1,2 +1,2 @@
#!/bin/bash #!/bin/bash
$(dirname $0)/lib/upgrade-zulip "$@" 2>&1 | tee -a /var/log/zulip/upgrade.log "$(dirname "$0")/lib/upgrade-zulip" "$@" 2>&1 | tee -a /var/log/zulip/upgrade.log

16
tools/build-deb
View File

@ -12,7 +12,7 @@ dist=$1
file=$2 file=$2
if [ -z "$dist" ] || [ -z "$file" ]; then if [ -z "$dist" ] || [ -z "$file" ]; then
echo "$(echo $0 | rev | cut -d "/" -f 1-1 | rev) -- build Debian packages on a Zulip buildslave" echo "$(echo "$0" | rev | cut -d "/" -f 1-1 | rev) -- build Debian packages on a Zulip buildslave"
echo echo
echo "USAGE: $0 dist path/to/package.dsc" echo "USAGE: $0 dist path/to/package.dsc"
exit 1 exit 1
@ -21,10 +21,10 @@ fi
set -xe set -xe
ret=0 ret=0
path=$(ssh -q -l $BUILDD_USERNAME $BUILDD_HOST -- mktemp -d $BUILDD_BASE_PATH/$USER.`date -u +%F.%R`.XXXXXXX)/ path=$(ssh -q -l "$BUILDD_USERNAME" "$BUILDD_HOST" -- "mktemp -d '$BUILDD_BASE_PATH/$USER.`date -u +%F.%R`.XXXXXXX'")/
dcmd rsync -vz --copy-links $file $BUILDD_USERNAME@$BUILDD_HOST:$path/ dcmd rsync -vz --copy-links "$file" "$BUILDD_USERNAME@$BUILDD_HOST:$path/"
file=$(basename $file) file=$(basename "$file")
# -A specifies to build arch-all packages (non-arch dependent) in addition to # -A specifies to build arch-all packages (non-arch dependent) in addition to
# binary packages # binary packages
@ -38,9 +38,9 @@ file=$(basename $file)
# #
# We always build for amd64. There is no 32-bit. # We always build for amd64. There is no 32-bit.
ssh -t -l $BUILDD_USERNAME $BUILDD_HOST -- "cd $path && sbuild -A -s --force-orig-source --dist=$dist --arch=amd64 $file" ssh -t -l "$BUILDD_USERNAME" "$BUILDD_HOST" -- "cd '$path' && sbuild -A -s --force-orig-source '--dist=$dist' --arch=amd64 '$file'"
rsync -Lvz --copy-links $BUILDD_USERNAME@$BUILDD_HOST:$path/* . rsync -Lvz --copy-links "$BUILDD_USERNAME@$BUILDD_HOST:$path/*" .
ssh -l $BUILDD_USERNAME $BUILDD_HOST rm -r $path ssh -l "$BUILDD_USERNAME" "$BUILDD_HOST" rm -r "$path"
exit $ret exit "$ret"

24
tools/build-release-tarball
View File

@ -11,8 +11,8 @@ prefix="zulip-server-$version"
if [ "$(uname)" = "Darwin" ]; then if [ "$(uname)" = "Darwin" ]; then
TMPDIR=/tmp/voyager-build TMPDIR=/tmp/voyager-build
rm -Rf $TMPDIR rm -Rf "$TMPDIR"
mkdir -p $TMPDIR mkdir -p "$TMPDIR"
else else
TMPDIR=$(mktemp -d) TMPDIR=$(mktemp -d)
fi fi
@ -27,10 +27,10 @@ TMP_CHECKOUT=$TMPDIR/$prefix/
TARBALL=$TMPDIR/$prefix.tar TARBALL=$TMPDIR/$prefix.tar
# .gitattributes lists the files that are not exported # .gitattributes lists the files that are not exported
git archive -o $TARBALL --prefix=$prefix/ HEAD git archive -o "$TARBALL" "--prefix=$prefix/" HEAD
if tar -tf $TARBALL | grep -q -e zilencer -e zproject/local_settings.py -e puppet/zulip_internal; then if tar -tf "$TARBALL" | grep -q -e zilencer -e zproject/local_settings.py -e puppet/zulip_internal; then
echo "Excluded files remain in tarball!"; echo "Excluded files remain in tarball!";
echo "Versions of git 1.8.1.1 - 1.8.1.6 have broken .gitattributes syntax"; echo "Versions of git 1.8.1.1 - 1.8.1.6 have broken .gitattributes syntax";
exit 1; exit 1;
@ -39,8 +39,8 @@ else
fi fi
# Check out a temporary full copy of the index to generate static files # Check out a temporary full copy of the index to generate static files
git checkout-index -f -a --prefix $TMP_CHECKOUT git checkout-index -f -a --prefix "$TMP_CHECKOUT"
cd $TMP_CHECKOUT cd "$TMP_CHECKOUT"
# Use default settings so there is no chance of leaking secrets # Use default settings so there is no chance of leaking secrets
cp zproject/local_settings_template.py zproject/local_settings.py cp zproject/local_settings_template.py zproject/local_settings.py
@ -70,8 +70,8 @@ echo; echo "\033[33mRunning update-prod-static; check ${TMP_CHECKOUT}update-prod
set -x set -x
./tools/update-prod-static ./tools/update-prod-static
echo $GITID > build_id echo "$GITID" > build_id
echo $version > version echo "$version" > version
mv update-prod-static.log .. mv update-prod-static.log ..
rm -f zproject/dev-secrets.conf rm -f zproject/dev-secrets.conf
@ -79,11 +79,11 @@ rm -f zproject/dev-secrets.conf
# We don't need duplicate copies of emoji with hashed paths, and they would break bugdown # We don't need duplicate copies of emoji with hashed paths, and they would break bugdown
find prod-static/serve/third/gemoji/images/emoji/ -regex '.*\.[0-9a-f]+\.png' -delete find prod-static/serve/third/gemoji/images/emoji/ -regex '.*\.[0-9a-f]+\.png' -delete
cd $TMPDIR cd "$TMPDIR"
tar --append -f $TARBALL $prefix/prod-static $prefix/build_id $prefix/version tar --append -f "$TARBALL" "$prefix/prod-static" "$prefix/build_id" "$prefix/version"
rm -rf $prefix rm -rf "$prefix"
gzip $TARBALL gzip "$TARBALL"
echo "Generated $TARBALL.gz" echo "Generated $TARBALL.gz"

10
tools/clean-branches
View File

@ -4,7 +4,7 @@
# and also any branches in origin which are ancestors of # and also any branches in origin which are ancestors of
# origin/master and are named like $USER-*. # origin/master and are named like $USER-*.
push_args='' push_args=()
function is_merged { function is_merged {
! git rev-list -n 1 origin/master.."$1" | grep -q . ! git rev-list -n 1 origin/master.."$1" | grep -q .
@ -31,7 +31,7 @@ function clean_ref {
echo -n "Deleting remote branch $remote_name" echo -n "Deleting remote branch $remote_name"
echo " (was $(git rev-parse --short "$ref"))" echo " (was $(git rev-parse --short "$ref"))"
# NB: this won't handle spaces in ref names # NB: this won't handle spaces in ref names
push_args="$push_args :$remote_name" push_args=("${push_args[@]}" ":$remote_name")
fi fi
;; ;;
esac esac
@ -44,8 +44,8 @@ fi
git fetch --prune origin git fetch --prune origin
eval $(git for-each-ref --shell --format='clean_ref %(refname);') eval "$(git for-each-ref --shell --format='clean_ref %(refname);')"
if [ -n "$push_args" ]; then if [ "${#push_args}" -ne 0 ]; then
git push origin $push_args git push origin "${push_args[@]}"
fi fi

16
tools/deploy-branch
View File

@ -2,7 +2,7 @@
function error_out { function error_out {
echo -en '\e[0;31m' echo -en '\e[0;31m'
echo $1 echo "$1"
echo -en '\e[0m' echo -en '\e[0m'
exit 1 exit 1
} }
@ -12,16 +12,16 @@ status=$(git status --porcelain | grep -v '^??')
old_ref=$(git rev-list --max-count=1 HEAD) old_ref=$(git rev-list --max-count=1 HEAD)
branch=$1 branch=$1
branch_ref=$(git rev-list --max-count=1 $branch) branch_ref=$(git rev-list --max-count=1 "$branch")
[ $? -ne 0 ] && error_out "Unknown branch: $branch" [ $? -ne 0 ] && error_out "Unknown branch: $branch"
if [ "$old_ref" == "$branch_ref" ]; then if [ "$old_ref" == "$branch_ref" ]; then
new_ref=master new_ref=master
else else
ref_name=$(git describe --all --exact $old_ref) ref_name=$(git describe --all --exact "$old_ref")
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
new_ref=$(echo $ref_name | perl -pe 's{^(heads|remotes)/}{}') new_ref=$(echo "$ref_name" | perl -pe 's{^(heads|remotes)/}{}')
else else
new_ref=$old_ref new_ref=$old_ref
fi fi
@ -31,13 +31,13 @@ fi
git fetch -p git fetch -p
git rebase origin/master $branch git rebase origin/master "$branch"
[ $? -ne 0 ] && error_out "Rebase onto origin/master failed" [ $? -ne 0 ] && error_out "Rebase onto origin/master failed"
git push . HEAD:master git push . HEAD:master
git push origin master git push origin master
[ $? -ne 0 ] && error_out "Push of master to origin/master failed" [ $? -ne 0 ] && error_out "Push of master to origin/master failed"
git checkout $new_ref git checkout "$new_ref"
git branch -D $branch git branch -D "$branch"
git push origin :$branch git push origin ":$branch"

14
tools/deployment-lock-ctl
View File

@ -15,23 +15,23 @@ exit 1
} }
if [[ $# < 1 || $# >2 ]]; then if [[ $# -lt 1 || $# -gt 2 ]]; then
usage usage
fi fi
function get_status { function get_status {
if (ssh zulip@$1.zulip.net '[ -d "'"$lockdir"'" ]'); then if (ssh "zulip@$1.zulip.net" '[ -d "'"$lockdir"'" ]'); then
printf "%-10s %b" "$1" "is currently \e[31mlocked\e[0m\n" printf "%-10s %b" "$1" "is currently \e[31mlocked\e[0m\n"
else else
printf "%-10s %b" "$1" "is currently \e[32munlocked\e[0m\n" printf "%-10s %b" "$1" "is currently \e[32munlocked\e[0m\n"
fi fi
} }
if [[ $1 == "lock" ]]; then if [[ "$1" == "lock" ]]; then
verb="mkdir" verb="mkdir"
elif [[ $1 == "unlock" ]]; then elif [[ "$1" == "unlock" ]]; then
verb="rmdir" verb="rmdir"
elif [[ $# == 1 && $1 == "status" ]]; then elif [[ $# == 1 && "$1" == "status" ]]; then
get_status "staging" get_status "staging"
get_status "prod0" get_status "prod0"
exit exit
@ -40,11 +40,11 @@ else
fi fi
if [[ $2 == "staging" ]]; then if [[ "$2" == "staging" ]]; then
ssh zulip@staging.zulip.net "$verb $lockdir" ssh zulip@staging.zulip.net "$verb $lockdir"
get_status "staging" get_status "staging"
exit exit
elif [[ $2 == "prod" ]]; then elif [[ "$2" == "prod" ]]; then
ssh zulip@prod0.zulip.net "$verb $lockdir" ssh zulip@prod0.zulip.net "$verb $lockdir"
get_status "prod0" get_status "prod0"
exit exit

2
tools/deprecated/iframe-bot/last-messages-wrapper.sh
View File

@ -11,7 +11,7 @@ COUNT=50
mkdir -p output mkdir -p output
while true; do while true; do
if python show-last-messages --api-key=$API_KEY --user=$BOT_EMAIL --streams="$STREAMS" --count=$COUNT; then if python show-last-messages --api-key="$API_KEY" --user="$BOT_EMAIL" --streams="$STREAMS" --count="$COUNT"; then
echo "[`date`] Success"; echo "[`date`] Success";
mv output-candidate.html output/zulip.html mv output-candidate.html output/zulip.html
touch output/zulip.html touch output/zulip.html

2
tools/deprecated/include-supported.example
View File

@ -21,5 +21,5 @@ if [ $# = 2 ]; then
fi fi
for dist in $DISTS; do for dist in $DISTS; do
reprepro --ignore=wrongdistribution include$type $dist "$1" reprepro --ignore=wrongdistribution "include$TYPE" "$dist" "$1"
done done

18
tools/deprecated/install-server
View File

@ -8,7 +8,7 @@ if [ -z "$hostname" ]; then
echo "USAGE: $0 server type hostname [branch]" echo "USAGE: $0 server type hostname [branch]"
exit 1 exit 1
fi fi
if ! $(echo "$hostname" | grep -q zulip); then if ! echo "$hostname" | grep -q zulip; then
echo "USAGE: $0 server type hostname [branch]" echo "USAGE: $0 server type hostname [branch]"
echo "Hostname must have zulip in it." echo "Hostname must have zulip in it."
exit 1 exit 1
@ -35,11 +35,11 @@ fi
# Force RSA keys. We do this because the ECDSA key is not printed on syslog, # Force RSA keys. We do this because the ECDSA key is not printed on syslog,
# and our puppet configuration does not use ECDSA. If we don't do this, # and our puppet configuration does not use ECDSA. If we don't do this,
# we'll get key errors after puppet apply. # we'll get key errors after puppet apply.
SSH_OPTS="-o HostKeyAlgorithms=ssh-rsa" SSH_OPTS=(-o HostKeyAlgorithms=ssh-rsa)
set +e set +e
ssh $SSH_OPTS "$server" -t -i "$amazon_key_file" -ladmin -o "ControlMaster=no" <<EOF ssh "${SSH_OPTS[@]}" "$server" -t -i "$amazon_key_file" -ladmin -o "ControlMaster=no" <<EOF
sudo sed -i 's/PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config sudo sed -i 's/PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config
sudo mkdir -p ~root/.ssh && sudo cp .ssh/authorized_keys ~root/.ssh/authorized_keys sudo mkdir -p ~root/.ssh && sudo cp .ssh/authorized_keys ~root/.ssh/authorized_keys
sudo service ssh restart sudo service ssh restart
@ -48,7 +48,7 @@ EOF
set -e set -e
ssh $SSH_OPTS "$server" -t -i "$amazon_key_file" -lroot <<EOF ssh "${SSH_OPTS[@]}" "$server" -t -i "$amazon_key_file" -lroot <<EOF
resize2fs /dev/xvda1 resize2fs /dev/xvda1
echo "$hostname" > /etc/hostname echo "$hostname" > /etc/hostname
sed -i 's/localhost$/localhost $hostname/' /etc/hosts sed -i 's/localhost$/localhost $hostname/' /etc/hosts
@ -69,9 +69,9 @@ EOF
# Give new server git access # Give new server git access
# TODO: Don't give servers push access to our git! # TODO: Don't give servers push access to our git!
scp $SSH_OPTS -i "$amazon_key_file" "$server_private_key_file" root@"$server":/root/.ssh/id_rsa scp "${SSH_OPTS[@]}" -i "$amazon_key_file" "$server_private_key_file" root@"$server":/root/.ssh/id_rsa
ssh $SSH_OPTS "$server" -t -i "$amazon_key_file" -lroot <<EOF ssh "${SSH_OPTS[@]}" "$server" -t -i "$amazon_key_file" -lroot <<EOF
chmod 600 /root/.ssh/id_rsa chmod 600 /root/.ssh/id_rsa
# Setup initial known_hosts including git server # Setup initial known_hosts including git server
cat > /root/.ssh/known_hosts <<EOF2 cat > /root/.ssh/known_hosts <<EOF2
@ -85,7 +85,7 @@ cd /root/zulip
git checkout $branch git checkout $branch
EOF EOF
ssh $SSH_OPTS "$server" -t -i "$amazon_key_file" -lroot <<EOF ssh "${SSH_OPTS[@]}" "$server" -t -i "$amazon_key_file" -lroot <<EOF
cp -a /root/zulip/puppet/zulip/files/puppet.conf /etc/puppet/ cp -a /root/zulip/puppet/zulip/files/puppet.conf /etc/puppet/
userdel admin userdel admin
@ -107,8 +107,8 @@ fi
EOF EOF
# TODO: Don't give servers push access to our git! # TODO: Don't give servers push access to our git!
scp $SSH_OPTS -i "$amazon_key_file" "$server_private_key_file" zulip@"$server":/home/zulip/.ssh/id_rsa scp "${SSH_OPTS[@]}" -i "$amazon_key_file" "$server_private_key_file" zulip@"$server":/home/zulip/.ssh/id_rsa
ssh $SSH_OPTS "$server" -t -i "$amazon_key_file" -lzulip <<EOF ssh "${SSH_OPTS[@]}" "$server" -t -i "$amazon_key_file" -lzulip <<EOF
chmod 600 /home/zulip/.ssh/id_rsa chmod 600 /home/zulip/.ssh/id_rsa
EOF EOF

2
tools/do-destroy-rebuild-test-database
View File

@ -1,5 +1,5 @@
#!/bin/sh -xe #!/bin/sh -xe
# This is a really simple wrapper script, pretty much for documenting clarity # This is a really simple wrapper script, pretty much for documenting clarity
`dirname $0`/../tools/generate-fixtures --force "`dirname "$0"`/../tools/generate-fixtures" --force

2
tools/generate-fixtures
View File

@ -6,7 +6,7 @@ function migration_status {
template_grep_error_code=$(echo "SELECT 1 from pg_database WHERE datname='zulip_test_template';" | python manage.py dbshell --settings=zproject.test_settings | grep -q "1 row"; echo $?) template_grep_error_code=$(echo "SELECT 1 from pg_database WHERE datname='zulip_test_template';" | python manage.py dbshell --settings=zproject.test_settings | grep -q "1 row"; echo $?)
if [ $template_grep_error_code == "0" ]; then if [ "$template_grep_error_code" == "0" ]; then
migration_status zerver/fixtures/available-migrations migration_status zerver/fixtures/available-migrations
if [ -e zerver/fixtures/migration-status ] && if [ -e zerver/fixtures/migration-status ] &&
cmp -s zerver/fixtures/available-migrations zerver/fixtures/migration-status && cmp -s zerver/fixtures/available-migrations zerver/fixtures/migration-status &&

16
tools/postgres-init-db
View File

@ -11,7 +11,7 @@ VAGRANTUSERNAME=$(whoami)
if [[ $# == 0 ]]; then if [[ $# == 0 ]]; then
USERNAME=zulip USERNAME=zulip
PASSWORD=$($(dirname $0)/../bin/get-django-setting LOCAL_DATABASE_PASSWORD) PASSWORD=$("$(dirname "$0")/../bin/get-django-setting" LOCAL_DATABASE_PASSWORD)
DBNAME=zulip DBNAME=zulip
SEARCH_PATH="$USERNAME",public SEARCH_PATH="$USERNAME",public
elif [[ $# == 4 ]]; then elif [[ $# == 4 ]]; then
@ -28,7 +28,7 @@ fi
DBNAME_BASE=${DBNAME}_base DBNAME_BASE=${DBNAME}_base
$ROOT_POSTGRES $DEFAULT_DB << EOF $ROOT_POSTGRES "$DEFAULT_DB" << EOF
CREATE USER $USERNAME; CREATE USER $USERNAME;
ALTER USER $USERNAME PASSWORD '$PASSWORD'; ALTER USER $USERNAME PASSWORD '$PASSWORD';
ALTER USER $USERNAME CREATEDB; ALTER USER $USERNAME CREATEDB;
@ -42,28 +42,28 @@ EOF
umask go-rw umask go-rw
PGPASS_PREFIX="*:*:*:$USERNAME:" PGPASS_PREFIX="*:*:*:$USERNAME:"
PGPASS_ESCAPED_PREFIX="*:\*:\*:$USERNAME:" PGPASS_ESCAPED_PREFIX="*:\*:\*:$USERNAME:"
if ! $(grep -q "$PGPASS_ESCAPED_PREFIX" ~/.pgpass); then if ! grep -q "$PGPASS_ESCAPED_PREFIX" ~/.pgpass; then
echo $PGPASS_PREFIX$PASSWORD >> ~/.pgpass echo "$PGPASS_PREFIX$PASSWORD" >> ~/.pgpass
else else
sed -i "s/$PGPASS_ESCAPED_PREFIX.*\$/$PGPASS_PREFIX$PASSWORD/" ~/.pgpass sed -i "s/$PGPASS_ESCAPED_PREFIX.*\$/$PGPASS_PREFIX$PASSWORD/" ~/.pgpass
fi fi
chmod go-rw ~/.pgpass chmod go-rw ~/.pgpass
psql -h localhost postgres $USERNAME <<EOF psql -h localhost postgres "$USERNAME" <<EOF
DROP DATABASE IF EXISTS $DBNAME; DROP DATABASE IF EXISTS $DBNAME;
DROP DATABASE IF EXISTS $DBNAME_BASE; DROP DATABASE IF EXISTS $DBNAME_BASE;
CREATE DATABASE $DBNAME_BASE CREATE DATABASE $DBNAME_BASE
EOF EOF
psql -h localhost $DBNAME_BASE $USERNAME <<EOF psql -h localhost "$DBNAME_BASE" "$USERNAME" <<EOF
CREATE SCHEMA zulip; CREATE SCHEMA zulip;
EOF EOF
$ROOT_POSTGRES $DBNAME_BASE << EOF $ROOT_POSTGRES "$DBNAME_BASE" << EOF
CREATE EXTENSION tsearch_extras SCHEMA zulip; CREATE EXTENSION tsearch_extras SCHEMA zulip;
EOF EOF
psql -h localhost postgres $USERNAME <<EOF psql -h localhost postgres "$USERNAME" <<EOF
CREATE DATABASE $DBNAME TEMPLATE $DBNAME_BASE; CREATE DATABASE $DBNAME TEMPLATE $DBNAME_BASE;
EOF EOF

2
tools/postgres-init-test-db
View File

@ -1,3 +1,3 @@
#!/bin/bash -xe #!/bin/bash -xe
$(dirname $0)/postgres-init-db zulip_test $($(dirname $0)/../bin/get-django-setting LOCAL_DATABASE_PASSWORD) zulip_test zulip,public "$(dirname "$0")/postgres-init-db" zulip_test "$("$(dirname "$0")/../bin/get-django-setting" LOCAL_DATABASE_PASSWORD)" zulip_test zulip,public

6
tools/test-js-with-node
View File

@ -6,11 +6,11 @@ export NODE_PATH=/usr/lib/nodejs:static
INDEX_JS=zerver/tests/frontend/node/index.js INDEX_JS=zerver/tests/frontend/node/index.js
NODEJS=$(which nodejs || which node) NODEJS=$(which nodejs || which node)
if [ f$1 = fcover ]; then if [ "$1" = "cover" ]; then
# Run a coverage test with Istanbul. # Run a coverage test with Istanbul.
istanbul cover $INDEX_JS istanbul cover "$INDEX_JS"
else else
# Normal testing, no coverage analysis. # Normal testing, no coverage analysis.
# Run the index.js test runner, which runs all the other tests. # Run the index.js test runner, which runs all the other tests.
$NODEJS --stack-trace-limit=100 $INDEX_JS "$NODEJS" --stack-trace-limit=100 "$INDEX_JS"
fi fi