diff options
| author | Jesusaves <cpntb1@ymail.com> | 2021-05-12 18:49:53 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2021-05-12 18:49:53 -0300 |
| commit | 2daa5a6e34ae0fceef9d330fef3eab29efac0978 (patch) | |
| tree | 5609b1557d6f6b26d72abd3a91046696da37975f | |
| parent | 6a343e058a776b1050773c53da583ac044df6f0f (diff) | |
| download | tools-2daa5a6e34ae0fceef9d330fef3eab29efac0978.tar.gz tools-2daa5a6e34ae0fceef9d330fef3eab29efac0978.tar.bz2 tools-2daa5a6e34ae0fceef9d330fef3eab29efac0978.tar.xz tools-2daa5a6e34ae0fceef9d330fef3eab29efac0978.zip | |
CI/Licensecheck update
| -rw-r--r-- | .gitignore | 5 | ||||
| -rwxr-xr-x | CI/licensecheck/checkfile.sh | 2 | ||||
| -rwxr-xr-x | CI/licensecheck/clientdata.sh | 10 | ||||
| -rwxr-xr-x | CI/licensecheck/serverdata.py | 2 |
4 files changed, 9 insertions, 10 deletions
@@ -50,13 +50,13 @@ dyecmd/src/Makefile dyecmd/src/cmake_install.cmake # testxml -testxml/errors.txt +CI/testxml/errors.txt # gitlab merger herculeswrapper/herc-map-wrapper-config # license check -licensecheck/npcs.txt +CI/licensecheck/npcs.txt # wiki wiki/Items.md @@ -83,7 +83,6 @@ hercules/old* # Jesusalva's personal stuff misc/* update/*back* -lang/in/JSave # Beta Server localserver/beta.patch diff --git a/CI/licensecheck/checkfile.sh b/CI/licensecheck/checkfile.sh index 2de49fe..d05378a 100755 --- a/CI/licensecheck/checkfile.sh +++ b/CI/licensecheck/checkfile.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash export name="$3" -export name=${name##../../client-data/} +export name=${name##../../../client-data/} grep "$name" $1 >/dev/null if [ "$?" != 0 ]; then diff --git a/CI/licensecheck/clientdata.sh b/CI/licensecheck/clientdata.sh index 583b197..c5d96e1 100755 --- a/CI/licensecheck/clientdata.sh +++ b/CI/licensecheck/clientdata.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash -export DIR="../../client-data" +export DIR="../../../client-data" -find -H $DIR -type f -name "*.png" -exec ./checkfile.sh $DIR/LICENSE $DIR/ART_LICENSE {} \; -find -H $DIR/sfx -type f -name "*.ogg" -exec ./checkfile.sh $DIR/LICENSE $DIR/ART_LICENSE {} \; -find -H $DIR -type f -name "*.tmx" -exec ./checkfile.sh $DIR/LICENSE $DIR/ART_LICENSE {} \; -find -H $DIR -type f -name "*.jpg" -exec ./checkfile.sh $DIR/LICENSE $DIR/ART_LICENSE {} \; +find -H $DIR -type f -name "*.png" -exec ./checkfile.sh $DIR/LICENSE $DIR/license.md {} \; +find -H $DIR/sfx -type f -name "*.ogg" -exec ./checkfile.sh $DIR/LICENSE $DIR/license.md {} \; +find -H $DIR -type f -name "*.tmx" -exec ./checkfile.sh $DIR/LICENSE $DIR/license.md {} \; +find -H $DIR -type f -name "*.jpg" -exec ./checkfile.sh $DIR/LICENSE $DIR/license.md {} \; diff --git a/CI/licensecheck/serverdata.py b/CI/licensecheck/serverdata.py index 02f4aec..28f1e07 100755 --- a/CI/licensecheck/serverdata.py +++ b/CI/licensecheck/serverdata.py @@ -20,7 +20,7 @@ except: pass # Determine correct path -PATH="../../server-data/npc/" +PATH="../../../server-data/npc/" if len(sys.argv) == 2: PATH=sys.argv[1] |