mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-27 01:57:52 +00:00
Code Issues Releases Wiki Activity

Merge pull request #816 from PeterDaveHello/improve-shellscript

Browse source 
fix shell script syntax errors and spacing inconsistencies
This commit is contained in:
Charles Kerr 2019-02-01 22:36:54 -06:00 committed by GitHub
commit 7058f37bed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 44 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
autogen.sh
View file

@ -1,31 +1,28 @@
#!/bin/sh #!/bin/sh
srcdir=`dirname $0` srcdir=$(dirname "$0")
test -z "$srcdir" && srcdir=. test -z "$srcdir" && srcdir=.
ORIGDIR=`pwd` ORIGDIR=$(pwd)
cd "$srcdir" cd "$srcdir" || exit 1
PROJECT=Transmission PROJECT=Transmission
GETTEXTIZE="glib-gettextize" GETTEXTIZE="glib-gettextize"
$GETTEXTIZE --version < /dev/null > /dev/null 2>&1 $GETTEXTIZE --version < /dev/null > /dev/null 2>&1
if test $? -ne 0; then if test $? -ne 0; then
GETTEXTIZE="" GETTEXTIZE=""
fi fi
LIBTOOLIZE=libtoolize LIBTOOLIZE=libtoolize
if libtoolize --help >/dev/null 2>&1 if libtoolize --help > /dev/null 2>&1; then
then
: :
elif glibtoolize --help >/dev/null 2>&1 elif glibtoolize --help > /dev/null 2>&1; then
then
LIBTOOLIZE=glibtoolize LIBTOOLIZE=glibtoolize
fi fi
export LIBTOOLIZE export LIBTOOLIZE
./update-version-h.sh ./update-version-h.sh
autoreconf -fi || exit 1; autoreconf -fi || exit 1
if test "$GETTEXTIZE"; then if test "$GETTEXTIZE"; then
echo "Creating aclocal.m4 ..." echo "Creating aclocal.m4 ..."
@ -41,10 +38,9 @@ fi
cd "$ORIGDIR" || exit $? cd "$ORIGDIR" || exit $?
if test -z "$AUTOGEN_SUBDIR_MODE"; then if test -z "$AUTOGEN_SUBDIR_MODE"; then
echo Running $srcdir/configure "$@" echo Running $srcdir/configure "$@"
$srcdir/configure "$@" $srcdir/configure "$@"
echo echo
echo "Now type 'make' to compile $PROJECT." echo "Now type 'make' to compile $PROJECT."
fi fi

2
daemon/my-valgrind.sh
View file

@ -1,4 +1,4 @@
#/bin/sh #!/bin/sh
export G_SLICE=always-malloc export G_SLICE=always-malloc
export G_DEBUG=gc-friendly export G_DEBUG=gc-friendly
export GLIBCXX_FORCE_NEW=1 export GLIBCXX_FORCE_NEW=1

8
extras/send-email-when-torrent-done.sh
View file

@ -47,7 +47,7 @@ SMTP_SERVER=your.smtp.server
SUBJECT="Torrent Done!" SUBJECT="Torrent Done!"
FROM_ADDR="transmission@localhost.localdomain" FROM_ADDR="transmission@localhost.localdomain"
TMPFILE=`mktemp -t transmission.XXXXXXXXXX` TMPFILE=$(mktemp -t transmission.XXXXXXXXXX)
echo "Transmission finished downloading \"$TR_TORRENT_NAME\" on $TR_TIME_LOCALTIME" >$TMPFILE echo "Transmission finished downloading \"$TR_TORRENT_NAME\" on $TR_TIME_LOCALTIME" > "$TMPFILE"
$NAIL -v -S from="$FROM_ADDR" -S smtp -s "$SUBJECT" -S smtp=$SMTP_SERVER "$TO_ADDR" < $TMPFILE $NAIL -v -S from="$FROM_ADDR" -S smtp -s "$SUBJECT" -S smtp=$SMTP_SERVER "$TO_ADDR" < "$TMPFILE"
rm $TMPFILE rm "$TMPFILE"

2
gtk/my-valgrind.sh
View file

@ -1,4 +1,4 @@
#/bin/sh #!/bin/sh
export G_SLICE=always-malloc export G_SLICE=always-malloc
export G_DEBUG=gc-friendly export G_DEBUG=gc-friendly
export GLIBCXX_FORCE_NEW=1 export GLIBCXX_FORCE_NEW=1

3
libtransmission/fail.sh
View file

@ -1,7 +1,8 @@
#!/bin/sh
err=0 err=0
count=0 count=0
while [ $err -eq 0 ]; do while [ $err -eq 0 ]; do
count=$((count+1)) count=$((count + 1))
echo starting run number $count echo starting run number $count
make check make check
err=$? err=$?

2
qt/my-valgrind.sh
View file

@ -1,4 +1,4 @@
#/bin/sh #!/bin/sh
#valgrind --tool=cachegrind ./transmission-qt 2>&1 | tee runlog #valgrind --tool=cachegrind ./transmission-qt 2>&1 | tee runlog
#valgrind --tool=massif --threshold=0.2 ./transmission-qt 2>&1 | tee runlog #valgrind --tool=massif --threshold=0.2 ./transmission-qt 2>&1 | tee runlog
valgrind --tool=memcheck --leak-check=full --leak-resolution=high --num-callers=16 --log-file=x-valgrind --show-reachable=no ./transmission-qt 2>&1 | tee runlog valgrind --tool=memcheck --leak-check=full --leak-resolution=high --num-callers=16 --log-file=x-valgrind --show-reachable=no ./transmission-qt 2>&1 | tee runlog

51
update-version-h.sh
View file

@ -2,47 +2,44 @@
# Generate files to be included: only overwrite them if changed so make # Generate files to be included: only overwrite them if changed so make
# won't rebuild everything unless necessary # won't rebuild everything unless necessary
replace_if_differs () replace_if_differs() {
{ if cmp "$1" "$2" > /dev/null 2>&1; then
if cmp $1 $2 > /dev/null 2>&1; then rm -f "$1"
rm -f $1 else
else mv -f "$1" "$2"
mv -f $1 $2 fi
fi
} }
echo "creating libtransmission/version.h" echo "creating libtransmission/version.h"
user_agent_prefix=`grep m4_define configure.ac | sed "s/[][)(]/,/g" | grep user_agent_prefix | cut -d , -f 6` user_agent_prefix=$(grep m4_define configure.ac | sed "s/[][)(]/,/g" | grep user_agent_prefix | cut -d , -f 6)
peer_id_prefix=`grep m4_define configure.ac | sed "s/[][)(]/,/g" | grep peer_id_prefix | cut -d , -f 6` peer_id_prefix=$(grep m4_define configure.ac | sed "s/[][)(]/,/g" | grep peer_id_prefix | cut -d , -f 6)
major_version=`echo ${user_agent_prefix} | awk -F . '{print $1}'` major_version=$(echo "${user_agent_prefix}" | awk -F . '{print $1}')
minor_version=`echo ${user_agent_prefix} | awk -F . '{print $2 + 0}'` minor_version=$(echo "${user_agent_prefix}" | awk -F . '{print $2 + 0}')
vcs_revision= vcs_revision=
vcs_revision_file=REVISION vcs_revision_file=REVISION
if [ -n "$JENKINS_URL" -a -n "$GIT_COMMIT" ]; then if [ -n "$JENKINS_URL" ] && [ -n "$GIT_COMMIT" ]; then
vcs_revision=$GIT_COMMIT vcs_revision=$GIT_COMMIT
elif [ -n "$TEAMCITY_PROJECT_NAME" -a -n "$BUILD_VCS_NUMBER" ]; then elif [ -n "$TEAMCITY_PROJECT_NAME" ] && [ -n "$BUILD_VCS_NUMBER" ]; then
vcs_revision=$BUILD_VCS_NUMBER vcs_revision=$BUILD_VCS_NUMBER
elif [ -d ".git" ] && type git >/dev/null 2>&1; then elif [ -d ".git" ] && type git > /dev/null 2>&1; then
vcs_revision=`git rev-list --max-count=1 HEAD` vcs_revision=$(git rev-list --max-count=1 HEAD)
elif [ -f "$vcs_revision_file" ]; then elif [ -f "$vcs_revision_file" ]; then
vcs_revision=`cat "$vcs_revision_file"` vcs_revision=$(cat "$vcs_revision_file")
fi fi
vcs_revision=`echo $vcs_revision`
if [ -n "$vcs_revision" ]; then if [ -n "$vcs_revision" ]; then
[ -f "$vcs_revision_file" ] && [ "`cat "$vcs_revision_file"`" = "$vcs_revision" ] || echo "$vcs_revision" > "$vcs_revision_file" [ -f "$vcs_revision_file" ] && [ "$(cat "$vcs_revision_file")" = "$vcs_revision" ] || echo "$vcs_revision" > "$vcs_revision_file"
else else
vcs_revision=0 vcs_revision=0
rm -f "$vcs_revision_file" rm -f "$vcs_revision_file"
fi fi
vcs_revision=`echo $vcs_revision | head -c10` vcs_revision=$(echo $vcs_revision | head -c10)
cat > libtransmission/version.h.new << EOF cat > libtransmission/version.h.new << EOF
#pragma once #pragma once
@ -61,9 +58,9 @@ EOF
# Add a release definition # Add a release definition
case "${peer_id_prefix}" in case "${peer_id_prefix}" in
*X-) echo '#define TR_BETA_RELEASE 1' ;; *X-) echo '#define TR_BETA_RELEASE 1' ;;
*Z-) echo '#define TR_NIGHTLY_RELEASE 1' ;; *Z-) echo '#define TR_NIGHTLY_RELEASE 1' ;;
*) echo '#define TR_STABLE_RELEASE 1' ;; *) echo '#define TR_STABLE_RELEASE 1' ;;
esac >> "libtransmission/version.h.new" esac >> "libtransmission/version.h.new"
replace_if_differs libtransmission/version.h.new libtransmission/version.h replace_if_differs libtransmission/version.h.new libtransmission/version.h