summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xlicensecheck/checkfile.sh9
-rwxr-xr-xlicensecheck/clientdata.sh8
2 files changed, 10 insertions, 7 deletions
diff --git a/licensecheck/checkfile.sh b/licensecheck/checkfile.sh
index bb613aa..2de49fe 100755
--- a/licensecheck/checkfile.sh
+++ b/licensecheck/checkfile.sh
@@ -1,9 +1,12 @@
#!/usr/bin/env bash
-export name="$2"
+export name="$3"
export name=${name##../../client-data/}
-grep "$name " $1 >/dev/null
+grep "$name" $1 >/dev/null
if [ "$?" != 0 ]; then
- echo "Missing license for $name"
+ grep "$name " $2 >/dev/null
+ if [ "$?" != 0 ]; then
+ echo "Missing license for $name"
+ fi
fi
diff --git a/licensecheck/clientdata.sh b/licensecheck/clientdata.sh
index fa08409..b1c5fb5 100755
--- a/licensecheck/clientdata.sh
+++ b/licensecheck/clientdata.sh
@@ -2,8 +2,8 @@
export DIR="../../client-data"
-find -H $DIR -type f -name "*.png" -exec ./checkfile.sh $DIR/LICENSE {} \;
-find -H $DIR/sfx -type f -name "*.ogg" -exec ./checkfile.sh $DIR/LICENSE {} \;
-find -H $DIR -type f -name "*.tmx" -exec ./checkfile.sh $DIR/LICENSE {} \;
-find -H $DIR -type f -name "*.jpg" -exec ./checkfile.sh $DIR/LICENSE {} \;
+find -H $DIR -type f -name "*.png" -exec ./checkfile.sh $DIR/LICENSE $DIR/SAULC.txt {} \;
+find -H $DIR/sfx -type f -name "*.ogg" -exec ./checkfile.sh $DIR/LICENSE $DIR/SAULC.txt {} \;
+find -H $DIR -type f -name "*.tmx" -exec ./checkfile.sh $DIR/LICENSE $DIR/SAULC.txt {} \;
+find -H $DIR -type f -name "*.jpg" -exec ./checkfile.sh $DIR/LICENSE $DIR/SAULC.txt {} \;