modified: README.md and tmwdelta.sh to fix permission bugHEADmaster

2 files changed, 42 insertions, 104 deletions

diff --git a/README.md b/README.md
index 144d30a..32fef2b 100644
--- a/README.md
+++ b/README.md
@@ -1,92 +1,14 @@
 # TMWDelta
 
-
+A script made to customize client data by overwriting official repo data.
+It should prevent "unknown item" errors in ManaPlus client even if your patches are outdated.
+TMWDelta will repack and push to your own with the less effort possible.
 
 ## Getting started
 
-To make it easy for you to get started with GitLab, here's a list of recommended next steps.
-
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
+Check constant in bash script tmwdelta.sh to reflect your own repo first
+Clone your repo one level before directory here
 
 ## Add your files
 
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
-
-```
-cd existing_repo
-git remote add origin https://git.themanaworld.org/livio/TMWDelta.git
-git branch -M master
-git push -uf origin master
-```
-
-## Integrate with your tools
-
-- [ ] [Set up project integrations](https://git.themanaworld.org/livio/TMWDelta/-/settings/integrations)
-
-## Collaborate with your team
-
-- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
-- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
-- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
-- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
-- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
-
-## Test and Deploy
-
-Use the built-in continuous integration in GitLab.
-
-- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
-- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
-- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
-- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
-- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
-
-***
-
-# Editing this README
-
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
-
-## Suggestions for a good README
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
-
-## Name
-Choose a self-explaining name for your project.
-
-## Description
-Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
-
-## Badges
-On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
-
-## Visuals
-Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
-
-## Installation
-Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
-
-## Usage
-Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
-
-## Support
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
-
-## Roadmap
-If you have ideas for releases in the future, it is a good idea to list them in the README.
-
-## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
-
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
-
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
-
-## Authors and acknowledgment
-Show your appreciation to those who have contributed to the project.
-
-## License
-For open source projects, say how it is licensed.
-
-## Project status
-If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
+Copy your "_patch" directory with your modifications to overwrite official ones.
diff --git a/tmwdelta.sh b/tmwdelta.sh
index d003ed2..e8e8f6e 100755
--- a/tmwdelta.sh
+++ b/tmwdelta.sh
@@ -5,25 +5,37 @@ repofile="https://github.com/themanaworld/tmwa-client-data/archive/master.zip"
 # repofile First directory name
 repofirstdir="tmwa-client-data-master"
 
+# Music repo
+musicrepo="https://github.com/themanaworld/tmw-music/archive/master.zip"
+# repofile First directory name
+musicrepofirstdir="tmw-music-master"
+
 # Modified data info
 patchrepoaddr="liviorecchia.gitlab.io"
-patchreponame="testworld"
+patchreponame="tmw-warworld"
+# It must be an absolute path to your existing client data repo. It doesn't matter if it's empty
+patchrepopath=$HOME/tmw_devel/$patchreponame
 # That's the directory with content modified from original zip NOT the modified repo
 patchdir="_patch"
 
 # Working file names
 repotemp="original.zip"
+repotempmusic="music.zip"
 
 update(){
     echo "Downloading original files"
     rm $repotemp
     wget $repofile -O $repotemp
+	wget $musicrepo -O $repotempmusic
+
 }
 
 restore(){
     echo "Uncompressing original data"
     rm $repofirstdir -Rf
     unzip $repotemp
+    rm $musicrepofirstdir -Rf
+    unzip $repotempmusic
     rm ../_uncompressed -Rf
 }
 
@@ -34,44 +46,47 @@ patch(){
     mkdir _uncompressed
     # copy TMW files and then those in patching directory
     cp $repofirstdir/* _uncompressed/ -urf  --preserve=all
+    cp $musicrepofirstdir/* _uncompressed/music -urf  --preserve=all
+
     echo "Patching original data"
     cp $patchdir/* _uncompressed/ -rf
     #--preserve=all
     # remove all _includes.xml files from patching directory!
 
     echo "Packing files for updates"
-    mkdir $patchreponame
     cd _uncompressed # change to uncompressed patched files directory
     # Zip compress any subdirectory (-r), show the remaining data to be compressed (-db), maxing out compression -0, and following file system updates (-FS)
-    zip ../$patchreponame/graphics -r -0 -FS graphics
-    zip ../$patchreponame/items -r -0 -FS items
-    zip ../$patchreponame/maps -r -0 -FS maps
-    zip ../$patchreponame/monsters -r -0 -FS monsters
-    zip ../$patchreponame/music -r -0 -FS music
-    zip ../$patchreponame/npcs -r -0 -FS npcs
-    zip ../$patchreponame/quests -r -0 -FS quests
-    zip ../$patchreponame/rules -r -0 -FS rules
-    zip ../$patchreponame/sfx -r -0 -FS sfx
-    zip ../$patchreponame/tilesets -r -0 -FS tilesets
-    zip ../$patchreponame/rootdir -r -0 -FS *.*
+    zip $patchrepopath/graphics -r -0 -FS graphics
+    zip $patchrepopath/items -r -0 -FS items
+    zip $patchrepopath/maps -r -0 -FS maps
+    zip $patchrepopath/monsters -r -0 -FS monsters
+    zip $patchrepopath/music -r -0 -FS music
+    zip $patchrepopath/npcs -r -0 -FS npcs
+    zip $patchrepopath/quests -r -0 -FS quests
+    zip $patchrepopath/rules -r -0 -FS rules
+    zip $patchrepopath/sfx -r -0 -FS sfx
+    zip $patchrepopath/tilesets -r -0 -FS tilesets
+    zip $patchrepopath/rootdir -r -0 -FS *.*
     cd ..
 
     echo "Computing resources' adler32 checksums"
-    cd $patchreponame # entering repo directory
+    #cd $patchreponame # entering repo directory
     #jacksum -a adler32 -x *.zip > .za32 # writing a temp file with checksums
-    ../adler32 0 *.zip > .za32
+thisdir=$(pwd)
+cd $patchrepopath
+    $($thisdir/adler32 0 *.zip > .za32)
 
     echo "Creating resource.xml"
     declare -a array 
     readarray -t array < .za32
-    echo '<?xml version="1.0"?>' > resources.xml # overwrite resource file
-    echo '<updates>' >> resources.xml
+    echo '<?xml version="1.0"?>' > $patchrepopath/resources.xml # overwrite resource file
+    echo '<updates>' >> $patchrepopath/resources.xml
     for element in "${array[@]}" # scan temp file lines for data
     do 
      IFS=$(echo -e ' \t ') read -r -a array2 <<< "${element}" # split by tabs
-     echo "<update type='data' file='${array2[0]}' hash='${array2[1]}'/>" >> resources.xml
+     echo "<update type='data' file='${array2[0]}' hash='${array2[1]}'/>" >> $patchrepopath/resources.xml
     done
-    echo '</updates>' >> resources.xml
+    echo '</updates>' >> $patchrepopath/resources.xml
     rm .za32 # remove temp file
     #echo "Deleting uncompressed directory"
     #rm ../_uncompressed -Rf
@@ -81,11 +96,12 @@ patch(){
     mkdir		$HOME/.local/share/mana/updates/$patchrepoaddr/$patchreponame/
     cp *.zip            $HOME/.local/share/mana/updates/$patchrepoaddr/$patchreponame/
     cp resources.xml    $HOME/.local/share/mana/updates/$patchrepoaddr/$patchreponame/resources.xml
+    chmod 0777 $HOME/.local/share/mana/updates/$patchrepoaddr/$patchreponame -R
 }
 
 push(){
     echo "Git pushing"
-    cd $patchreponame
+    cd $patchrepopath
     git add .
     git commit -m "Test of resource packing"
     git push -u origin master