cleaned up nasher scripts, fixed some batch and bash scripts

The-Frozen-North · Nov 3, 2024 · e04155f · e04155f
1 parent b9e325d
commit e04155f
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 124 deletions.
diff --git a/linux_nasher_install.sh b/linux_nasher_install.sh
@@ -7,7 +7,6 @@ echo "It will automatically continue if you do not have module built (clean slat
 echo
 echo "WARNING: Continuing will rebuild the module from source, deleting all unsaved changes! Commit or stash your changes, or exit out."
 
-rm -rf .build/modules/TFN
 rm -rf .build/modules
 
 mkdir -p .build
@@ -18,6 +17,16 @@ cp -r override .build/override
 mkdir -p .build/database
 mkdir -p .build/movies
 mkdir -p .build/modules
+mkdir -p .build/config
+
+rm .build/docker-compose-dev.yml
+cp docker-compose-dev.yml .build/docker-compose-dev.yml
+
+rm .build/docker-compose-dev-seed.yml
+cp docker-compose-dev-seed.yml .build/docker-compose-dev-seed.yml
+
+rm .build/config/common.env
+cp config/common.env .build/config/common.env
 
 # Delete existing databases
 rm .build/database/spawns.sqlite3
@@ -35,12 +44,5 @@ $PWD/tools/linux/sqlite/sqlite3 .build/database/spawns.sqlite3 < seeded_database
 $PWD/tools/linux/sqlite/sqlite3 .build/database/areadistances.sqlite3 < seeded_database/areadistances.txt
 
 cp movies/prelude.wbm .build/movies/prelude.wbm
-cp nasher.cfg .build/nasher.cfg
-
-rm TFN.mod
-
-cd .build
-
-$PWD/../tools/linux/nasher/nasher install  --verbose --erfUtil:"$PWD/../tools/linux/neverwinter/nwn_erf" --gffUtil:"$PWD/../tools/linux/neverwinter/nwn_gff" --tlkUtil:"$PWD/../tools/linux/neverwinter/nwn_tlk" --nssCompiler:"$PWD/../tools/linux/nwnsc/nwnsc" --installDir:"$PWD" --nssFlags:"-oe -i $PWD/../nwn-base-scripts" --yes
 
-rm TFN.mod
+$PWD/tools/linux/nasher/nasher install  --verbose --erfUtil:"$PWD/tools/linux/neverwinter/nwn_erf" --gffUtil:"$PWD/tools/linux/neverwinter/nwn_gff" --tlkUtil:"$PWD/tools/linux/neverwinter/nwn_tlk" --nssCompiler:"$PWD/tools/linux/nwnsc/nwnsc" --installDir:"$PWD/.build" --nssFlags:"-oe -i $PWD/nwn-base-scripts" --yes
diff --git a/linux_nasher_unpack.sh b/linux_nasher_unpack.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+$PWD/tools/linux/nasher/nasher unpack --file:.build/modules/TFN.mod --removeDeleted --erfUtil:"$PWD/tools/linux/neverwinter/nwn_erf" --gffUtil:"$PWD/tools/linux/neverwinter/nwn_gff" --tlkUtil:"$PWD/tools/linux/neverwinter/nwn_tlk" --nssFlags:"-l"
+git rm --cached src -r
+git add .
diff --git a/linux_nasher_unpack_folder.sh b/linux_nasher_unpack_folder.sh
diff --git a/linux_run_server.sh b/linux_run_server.sh
@@ -24,16 +24,13 @@ hash=${hash:0:6}
 desc="$desc
 Last Updated: $timestamp ($hash)"
 
-cd .build
-$PWD/../tools/linux/nasher/nasher install --clean --erfUtil:"$PWD/../tools/linux/neverwinter/nwn_erf" --gffUtil:"$PWD/../tools/linux/neverwinter/nwn_gff" --tlkUtil:"$PWD/../tools/linux/neverwinter/nwn_tlk" --nssCompiler:"$PWD/../tools/linux/nwnsc/nwnsc" --installDir:"$PWD" --nssFlags:"-oe -i $PWD/../nwn-base-scripts" --no --modDescription="$desc"
+$PWD/tools/linux/nasher/nasher install --clean --erfUtil:"$PWD/tools/linux/neverwinter/nwn_erf" --gffUtil:"$PWD/tools/linux/neverwinter/nwn_gff" --tlkUtil:"$PWD/tools/linux/neverwinter/nwn_tlk" --nssCompiler:"$PWD/tools/linux/nwnsc/nwnsc" --installDir:"$PWD/.build" --nssFlags:"-oe -i $PWD/nwn-base-scripts" --no --modDescription="$desc"
 
 if [[ ! -f TFN.mod ]] ; then
     echo 'Module does not exist, aborting.'
     exit
 fi
 
-cd ..
-
 # rm server/config/common.env
 rm server/modules/TFN.mod
 rm -d -R  server/override
@@ -65,8 +62,6 @@ $PWD/tools/linux/sqlite/sqlite3 server/database/areadistances.sqlite3 < seeded_d
 cp server/env/env.2da server/override/env.2da
 cp server/env/env_dm.2da server/override/env_dm.2da
 
-rm TFN.mod
-
 cd server
 docker-compose down 
 docker-compose up --no-recreate -d
diff --git a/linux_run_server_dev.sh b/linux_run_server_dev.sh
@@ -1,13 +1,5 @@
 #!/bin/bash
 
-mkdir -p .build/config
-
-rm .build/docker-compose-dev.yml
-cp docker-compose-dev.yml .build/docker-compose-dev.yml
-
-rm .build/config/common.env
-cp config/common.env .build/config/common.env
-
 cd .build
 
 docker-compose -f docker-compose-dev.yml down

diff --git a/linux_run_server_dev_seed.sh b/linux_run_server_dev_seed.sh
@@ -5,7 +5,6 @@ rm .build/database/areadistances.sqlite3
 rm .build/database/tmapsolutions.sqlite3
 
 mkdir -p .build/database
-mkdir -p .build/config
 
 # Delete existing databases, because sqlite will attempt to load it into an existing database instead of overwriting
 rm .build/database/spawns.sqlite3
@@ -22,12 +21,6 @@ $PWD/tools/linux/sqlite/sqlite3 .build/database/randspellbooks.sqlite3 < seeded_
 $PWD/tools/linux/sqlite/sqlite3 .build/database/prettify.sqlite3 < seeded_database/prettify.txt
 $PWD/tools/linux/sqlite/sqlite3 .build/database/areadistances.sqlite3 < seeded_database/areadistances.txt
 
-rm .build/docker-compose-dev-seed.yml
-cp docker-compose-dev-seed.yml .build/docker-compose-dev-seed.yml
-
-rm .build\config\common.env
-cp config/common.env .build/config/common.env
-
 cd .build
 
 docker-compose -f docker-compose-dev-seed.yml down

diff --git a/nasher.cfg b/nasher.cfg
@@ -6,17 +6,12 @@ url = ""
 author = ""
 
 [Sources]
-include = "../src/**/*.{nss,json}"
+include = "src/**/*.{nss,json}"
 
 [Rules]
-"*" = "../src/$ext"
+"*" = "src/$ext"
 
 [Target]
 name = "mod"
-file = "TFN.mod"
-description = ""
-
-[Target]
-name = "slim"
-file = "TFN.mod"
-filter = "*.{nss,ndb,gic}"
+file = ".build/modules/TFN.mod"
+description = ""
diff --git a/win_nasher_install.bat b/win_nasher_install.bat
@@ -8,7 +8,6 @@ echo WARNING: Continuing will rebuild the module from source, deleting all unsav
 @echo on
 
 del .build\modules /S
-rd .build\modules\TFN
 rd .build\modules
 
 md .build
@@ -19,6 +18,16 @@ robocopy override .build\override
 md .build\database
 md .build\movies
 md .build\modules
+md .build\config
+
+del /f .build\docker-compose-dev.yml
+copy docker-compose-dev.yml .build\docker-compose-dev.yml
+
+del /f .build\docker-compose-dev-seed.yml
+copy docker-compose-dev-seed.yml .build\docker-compose-dev-seed.yml
+
+del /f .build\config\common.env
+copy config\common.env .build\config\common.env
 
 :: Delete existing databases, because sqlite will attempt to load it into an existing database instead of overwriting
 del /f .build\database\spawns.sqlite3
@@ -36,13 +45,7 @@ del /f .build\database\areadistances.sqlite3
 "%CD%/tools/win/sqlite/sqlite3.exe" .build/database/areadistances.sqlite3 < seeded_database/areadistances.txt
 
 copy movies\prelude.wbm .build\movies\prelude.wbm
-copy nasher.cfg .build\nasher.cfg
-
-del /f TFN.mod
-
-cd .build
 
-"%CD%/../tools/win/nasher/nasher.exe" install  --verbose --erfUtil:"%CD%/../tools/win/neverwinter64/nwn_erf.exe" --gffUtil:"%CD%/../tools/win/neverwinter64/nwn_gff.exe" --tlkUtil:"%CD%/../tools/win/neverwinter64/nwn_tlk.exe" --nssCompiler:"%CD%/../tools/win/nwnsc/nwnsc.exe" --installDir:"%CD%" --nssFlags:"-oe -i ""%CD%/../nwn-base-scripts""" --no
+"%CD%/tools/win/nasher/nasher.exe" install --verbose --erfUtil:"%CD%/tools/win/neverwinter64/nwn_erf.exe" --gffUtil:"%CD%/tools/win/neverwinter64/nwn_gff.exe" --tlkUtil:"%CD%/tools/win/neverwinter64/nwn_tlk.exe" --nssCompiler:"%CD%/tools/win/nwnsc/nwnsc.exe" --installDir:"%CD%/.build" --nssFlags:"-oe -i ""%CD%/nwn-base-scripts""" --no
 
-del /f TFN.mod
 pause
diff --git a/win_nasher_install_clean.bat b/win_nasher_install_clean.bat
diff --git a/win_nasher_unpack.bat b/win_nasher_unpack.bat
@@ -0,0 +1,3 @@
+"%CD%/tools/win/nasher/nasher.exe" unpack --file:.build/modules/TFN.mod --removeDeleted --erfUtil:"%CD%/tools/win/neverwinter64/nwn_erf.exe" --gffUtil:"%CD%/tools/win/neverwinter64/nwn_gff.exe" --tlkUtil:"%CD%/tools/win/neverwinter64/nwn_tlk.exe" --nssFlags:"-l"
+git rm --cached src -r
+git add .
diff --git a/win_nasher_unpack_folder.bat b/win_nasher_unpack_folder.bat
diff --git a/win_run_server.bat b/win_run_server.bat
@@ -10,7 +10,6 @@ echo WARNING: Continuing will rebuild the module from source, deleting all unsav
 @echo on
 
 del .build\modules /S
-rd .build\modules\TFN
 rd .build\modules
 
 md .build
@@ -37,11 +36,7 @@ set "content=!content!Last Updated: %timestamp% (%hash%)"
 
 endlocal
 
-cd .build
-
-"%CD%/../tools/win/nasher/nasher.exe" install  --verbose --erfUtil:"%CD%/../tools/win/neverwinter64/nwn_erf.exe" --gffUtil:"%CD%/../tools/win/neverwinter64/nwn_gff.exe" --tlkUtil:"%CD%/../tools/win/neverwinter64/nwn_tlk.exe" --nssCompiler:"%CD%/../tools/win/nwnsc/nwnsc.exe" --installDir:"%CD%" --nssFlags:"-oe -i ""%CD%/../nwn-base-scripts""" --no --modDescription "!content!"
-
-cd ..
+"%CD%/tools/win/nasher/nasher.exe" install  --verbose --erfUtil:"%CD%/tools/win/neverwinter64/nwn_erf.exe" --gffUtil:"%CD%/tools/win/neverwinter64/nwn_gff.exe" --tlkUtil:"%CD%/tools/win/neverwinter64/nwn_tlk.exe" --nssCompiler:"%CD%/tools/win/nwnsc/nwnsc.exe" --installDir:"%CD%/.build" --nssFlags:"-oe -i ""%CD%/nwn-base-scripts""" --no --modDescription "!content!"
 
 del /f server\config\common.env
 del /f server\modules\TFN.mod
@@ -80,8 +75,6 @@ robocopy override server\override
 copy server\env\env.2da server\override\env.2da
 copy server\env\env_dm.2da server\override\env_dm.2da
 
-del /f .build\TFN.mod
-
 cd server
 docker-compose -f docker-compose.yml down 
 docker-compose -f docker-compose.yml up --no-recreate -d

diff --git a/win_run_server_dev.bat b/win_run_server_dev.bat
@@ -1,9 +1,3 @@
-del /f .build\docker-compose-dev.yml
-copy docker-compose-dev.yml .build\docker-compose-dev.yml
-
-del /f .build\config\common.env
-copy config\common.env .build\config\common.env
-
 cd .build
 
 docker-compose -f docker-compose-dev.yml down

diff --git a/win_run_server_dev_seed.bat b/win_run_server_dev_seed.bat
@@ -13,7 +13,6 @@ del /f .build\database\tmapsolutions.sqlite3
 del /f .build\database\areadistances.sqlite3
 
 md .build\database
-md .build\config
 
 :: Delete existing databases, because sqlite will attempt to load it into an existing database instead of overwriting
 del /f .build\database\spawns.sqlite3
@@ -30,12 +29,6 @@ del /f .build\database\areadistances.sqlite3
 "%CD%/tools/win/sqlite/sqlite3.exe" .build/database/prettify.sqlite3 < seeded_database/prettify.txt
 "%CD%/tools/win/sqlite/sqlite3.exe" .build/database/areadistances.sqlite3 < seeded_database/areadistances.txt
 
-del /f .build\docker-compose-dev-seed.yml
-copy docker-compose-dev-seed.yml .build\docker-compose-dev-seed.yml
-
-del /f .build\config\common.env
-copy config\common.env .build\config\common.env
-
 cd .build
 
 docker-compose -f docker-compose-dev-seed.yml down