summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2017-02-28 18:00:42 +0100
committerCarlos Soriano <csoriano@gnome.org>2017-03-01 11:08:37 +0100
commitd18665b9afc87aebc6e2a1dfbe98e4d2ec4ce928 (patch)
tree96fa2fb4070d66c587bd6b79265791b7b5221abf
parent523ebbee197f1e7e4eb80e43497768500fa791f8 (diff)
downloadnautilus-d18665b9afc87aebc6e2a1dfbe98e4d2ec4ce928.tar.gz
general: Allow running uncrustify from elsewhere
run-uncrustify.sh script uses cwd relative file names, which fails if it is ran from the repository root or other directory. This commit fixes the paths relative to the script. https://bugzilla.gnome.org/show_bug.cgi?id=779408
-rwxr-xr-xdata/run-uncrustify.sh11
1 files changed, 6 insertions, 5 deletions
diff --git a/data/run-uncrustify.sh b/data/run-uncrustify.sh
index 3114f557d..39bb29006 100755
--- a/data/run-uncrustify.sh
+++ b/data/run-uncrustify.sh
@@ -1,13 +1,14 @@
#!/bin/bash
-if [ -x "lineup-parameters" ];
+DATA=$(dirname "$BASH_SOURCE")
+if [ -x "$DATA/lineup-parameters" ];
then
- for DIR in ../src ../nautilus-desktop ../test ../libnautilus-extension ../eel ../nautilus-sendto-extension
+ for DIR in "$DATA/../"{src,nautilus-desktop,test,libnautilus-extension,eel,nautilus-sendto-extension}
do
- for FILE in $(find $DIR -name "*.c")
+ for FILE in $(find "$DIR" -name "*.c")
do
# Aligning prototypes is not working yet, so avoid headers
- uncrustify -c uncrustify.cfg --no-backup $FILE
- ./lineup-parameters $FILE > $FILE.temp && mv $FILE.temp $FILE
+ uncrustify -c "$DATA/uncrustify.cfg" --no-backup "$FILE"
+ "$DATA/lineup-parameters" "$FILE" > "$FILE.temp" && mv "$FILE.temp" "$FILE"
done
done
else