summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJannis Pohlmann <jannis@xfce.org>2007-02-13 12:02:06 +0000
committerJannis Pohlmann <jannis@xfce.org>2007-02-13 12:02:06 +0000
commit351c61ec2856a44456eba553c73e2c5f45ef2a49 (patch)
tree110c1c0455ed669ad87c0296239d518adffaad97
parent388a7f477399513d10577022c9067835f95571cc (diff)
downloadxfce4-dev-tools-351c61ec2856a44456eba553c73e2c5f45ef2a49.tar.gz
* scripts/xdt-commit: Add more quotes around variables. Use
"type svn" to check whether Subversion is installed. (Old svn revision: 24967)
-rw-r--r--ChangeLog5
-rwxr-xr-xscripts/xdt-commit10
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 4e70935..08b58c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-13 Jannis Pohlmann <jannis@xfce.org>
+
+ * scripts/xdt-commit: Add more quotes around variables. Use
+ "type svn" to check whether Subversion is installed.
+
2007-02-12 Jannis Pohlmann <jannis@xfce.org>
* scripts/Makefile.am, scripts/xdt-commit: Add script for
diff --git a/scripts/xdt-commit b/scripts/xdt-commit
index 664b6b2..cce9164 100755
--- a/scripts/xdt-commit
+++ b/scripts/xdt-commit
@@ -28,7 +28,7 @@
##
## Check if SVN is installed
##
-if ! svn --version &> /dev/null; then
+if ! type svn &> /dev/null; then
echo "Subversion needs to be installed."
exit 1
fi
@@ -63,13 +63,13 @@ for CHANGELOG in $CHANGELOGS; do
# Make sure the file exists
if [ -f "$CHANGELOG" ]; then
# Determine SVN status
- STATUS=$(svn status ${CHANGELOG})
+ STATUS=$(svn status "${CHANGELOG}")
STATUS=${STATUS:0:1}
# Check if file is versioned
if [ "$STATUS" != "?" ]; then
# Parse output
- MSG=$(svn diff ${CHANGELOG} | grep -P '^\+\t' | sed 's/^+//')
+ MSG=$(svn diff "${CHANGELOG}" | grep -P '^\+\t' | sed 's/^+//')
# Append to commit message (and insert newline between ChangeLogs)
if [ -z "$COMMIT_MSG" ]; then
@@ -87,7 +87,7 @@ done
## files is empty, ask the user to enter a commit message himself
##
if [ -n "$COMMIT_MSG" ]; then
- svn commit $FILES -m "$COMMIT_MSG"
+ svn commit "$FILES" -m "$COMMIT_MSG"
else
- svn commit $FILES
+ svn commit "$FILES"
fi