Firstly I need to say, I am only writing the guide and everything what will be said here, is originaly from Ianni -HUGE thanks to him!!
!!!! If you are going to follow this guide make sure you made a backup of your AddOns folder in case something will go wrong !!!
If you follow it you should be able to update your tukui while keeping your changes done in .lua files. It should work even for other edits like Elv, but you will have to change github link to (for ElvUI as example) git://github.com/Elv22/Tukui.git - however I'm not really sure, feel free to try it if you are using Elv :-)
Here is the guide itself, step by step(first 9 steps written with italic font needs to be done - you need to do 10th step everytime you change something and then you want to update. The rest needs to be done at every update. only for the first time) -
2) Restart your computer after installing the software downloaded in step above.
3) After restarting right click your desktop and you should see this
4) Now find your Tukui.toc file and find out what is your current Tukui version. Tukui.toc can be found in World of Warcraft\Interface\AddOns\Tukui - see the picture
5) Create an empty folder somewhere, but not inside the WoW folder. Mine is for example called Git(but you can call it as you wish, it doesnt matter).
6) Right click the folder and select Git clone. Then enter in the url: git://github.com/tukz/Tukui.git - see the picture , then just wait to finish downloading files(there will be a window with a blue turtle and down there it shoud be written small blue "Succes."
7) In the folder you created before there should be Tukui folder with green icon(if there is no icon, it prolly means you haven´t restarted your computer after installing Tortoisegit). Inside the Tukui folder should be another Tukui folder + Tukui_Heal_Layout and Tukui_DPS_Layout folders. Right click the Tukui folder(the FIRST one, which contains the three mentioned above) and select Tortoisegit ==>> Show log - a window with log appears. See the picture
8) Now you need to go back in time of the version you have currently installed. In the log window find a row saying go go gatget xx.yy(or aa.bb to xx.yy - for example 12.29 to 12.30), where xx.yy is your current version found in step 4. If your version is for example 12.30, you need to find this row - picture . Then you right click the row and select Reset master to this.. and check Hard reset then press Ok - see the pic.
9) Replace(overwrite) your Tukui, Tukui_Heal_Layout and Tukui_DPS_Layout in your Created folder(from step 5) by the same folders found inside your World of Warcraft\Interface\Addons - see the pic
10) Right click the first Tukui folder inside your created folder and select git commit "master". See pic. A window which asks you for email and name should appear - you can fill there whatever you want and click Ok - it´s not important. Then another window appears and you need to write there your commit(what you have changed and so on) and click Ok. See pic.
11) Right click the first Tukui folder inside your created folder and select (lol again :-) ) and select TortoiseGit ==>> Pull . See the pic. If you have an error with collisions(means you changed some files Tukz also changed in his update) continue do step 12 then come back to step 11 :-)
12) THIS step must be done only if you get warning about collisions in step 11 - if you had no collisions SKIP it ) - Right click the first Tukui folder inside your created folder and select TortoiseGit ==>> Resolve. See the pic. If there are some, you need to double click each one and an editor with Tukz version of file appears on left, your version on right and the merged down. These files are the ones where you edited something Tukz also edited, so you need to decide if you will keep your changes or Tukz. After staring into the editor for couple of minutes you´ll get how to do it :-) After solving the collisions do step 11 again.
13) Last step - replace your Tukui, Tukui_Heal_Layout, Tukui_DPS_Layout in your Interface\AddOns with folders from your created folder\Tukui\ - see the pic Your Tukui is now(HOPEFULLY) up to date.
GrimboldPosted 2 years ago - #1
Hi, Ianni here :) Well done, I have only two things to mention.
First : TortoiseGit needs msysgit to be installed. Only as a note ;)
Second: Step 11) Resolve should only be necessary after a "Pull" so maybe change steps 11 and 12 and mark resolve as optional, as it will not always occur.
And maybe make it clear that steps 1-10 are only to do at the first time ;)Posted 2 years ago - #2
Guide updated a bit.Posted 2 years ago - #3
i hope you installed msysgit and not mysysgit and the path in the screenshot is just a typo ;)
check the program you installed, check the path
in addition you have to enter the path to the binary folder: <install-dir>/msysgit/binPosted 2 years ago - #5
And that seems to be working. Thank you soo much Kenshi. Silly spelling mistakes! I need more coffee.
Thank you Grimbold for the guide.Posted 2 years ago - #6
Thank you so much for this guide, I was still using v2.06 (lol), but since I made so many code changes to it I didn't want to redo them all, this way, I got to update my version and still keep my changes, thanks a lot once again \o/Posted 2 years ago - #7
anyone make a german translation for this? :<Posted 2 years ago - #8
I´m sorry, even tho half of my family live in Germany, the only sentence I can say in german is : Frau Professorin, entschuldigen Sie mich, ich habe nicht meine Haufausgabe - it was the sentence I was saying in the beginning of every german language class on high school :-D :-D
Edit: And I dont even know if that sentence is right xDPosted 2 years ago - #9
its the right sentence :xPosted 2 years ago - #10
Small edit - everytime you update you need to do step 10 - commit again in order to sucessfuly update.Posted 2 years ago - #11
wat im doing wrong im on step 12
and this window http://img815.imageshack.us/img815/7304/step11b.jpg is empty?Posted 2 years ago - #12
wat im doing wrong im on step 12
and this window http://img815.imageshack.us/img815/7304/step11b.jpg is empty?
nothing. Resolve is only necessary if and only if there are updates to parts of tukui that you have modified and git is not able to integrate them.
An example: someone who only moved the position of the lootroll window, will almost surely never see the resolve message, because the probability that tukz changes this one line is not that high ;)
But someone who made huge modifications to almost everything will see it most likely on most updates.
If there is nothing to resolve be happy :)Posted 2 years ago - #13
Slightly updated steps 11 and 12, I hope it´s more undrstandable now. I hope the guide is not confusing anyone so much :-)Posted 2 years ago - #14
gogo some german translate plz :P
dont know whats going wrong for me dont work im follow all steps after i copy back in wow folder and overwrite hes not the newest version :xPosted 2 years ago - #15
gogo some german translate plz :P
dont know whats going wrong for me dont work im follow all steps after i copy back in wow folder and overwrite hes not the newest version :x
I don't think that the language of the guide is the problem. Try to locate your error by controlling each step.
was the hard reset made right? check the toc file in the repo. you updated your files? check them in the repo.
you made a commit? check the icons on the folders ( there should be a green one ;) )
you made the pull? check the new toc file. anything to resolve? check the icons.
Is there an error message during the commit or pull? post it ;)
so it should be no problem to help you ;)
And because the guide is written in very basic english i hope we can avoid it to translate it into several other languages ;)Posted 2 years ago - #16
gogo gadget was only a "fancy" comment by tukz... look for something which indicates the version you are currently using...
I am sure ext uses something like this... or he should. ;)
if you open his github repo and select commits you see entrys like
1.2.2 Last one before cataclysm
look for your version number ;)
PS: I like inspector gadget :DPosted 2 years ago - #18
First off... Thank you for the guide. Much easier to follow than all the others I have tried. Unfortunately, I have yet to be successful in this.
I followed through the steps, the only difference is that I am using Elv's edit, and therefore changed the url to the appropriate one. I had some resolves that I went through. Mainly the changing of True/False flags for things like charportrait, as that is the only editing I do on Elv's edit, I don't change the positioning of anything.
After completing all the steps... I received the success notices, but when I log into the game.... My UI is all messed up. Not a single tukui skin or anything. Actionbars are off the screen... its ugly.
I cleared my WTF and such, but can't seem to see what I'm doing wrong. I reverted it all to a back up, tried again... and same problem.
Are my other addons (Skada, DXE, so on and so forth) interfering with the update? Do i need to do a complete wipe of my WTF and Interface every time I do this? Normally the way I update is to download the latest version of the edit I am using, and then wipe both the WTF and Interface folder and start with a clean install. This is tedious as I then have to re-install all other addons, as well as configure them. Doing this once a month isn't a big deal, but with Elv adding so many new things lately, I was hoping to start using something like this to make it easier to stay up to date.
Any help would be appreciated.Posted 2 years ago - #19
@ remnorr: this guide is basically for every addon ( / software) with a github (/ git) repo.
I do not use elv's edit myself, but i hva seen that he is testing na new beta version at the moment, and i don't know if your saved variables from version 2.x fit to the beta v3. i suggest to make a hard reset to the commit before the two called
"V3 Beta Initial commit, include actionbar toggler, layout change, and more. "
"TOC to v3 Beta "
made on 2010-11-28.
or you step into beta testing, make a /reset ui and try to live with the beta version after you customized it again. ( The things that are configured by saved variables)
For more help i suggest you ask in the elv edit section.Posted 2 years ago - #20
Tommorow I´m gonna try updating edited Elv used by a friend of mine to new version and I´ll tell you results :-)Posted 2 years ago - #21
The resolving is really confusing with this. It has all these differences but they aren't even differences =/ I'm thinking that I might just write down every change I made and edit them in each time, seems easier than using this =/Posted 2 years ago - #22
The resolving is really confusing with this. It has all these differences but they aren't even differences =/ I'm thinking that I might just write down every change I made and edit them in each time, seems easier than using this =/
Yeah that might be fine for small changes but I have several changes on many files and this is definitely the better way to go.Posted 2 years ago - #23
Yeah that might be fine for small changes but I have several changes on many files and this is definitely the better way to go.
I have heaps too but I can't figure out whats changed and what hasn't with this viewer =/
Like it comes up with differences that don't exist. I check both files and they are the same but it's got a bunch of other orange lines saying that stuff has changed =/
EDIT: I think most of my problem is that I'm trying to use Toresh's edit and getting this to work. Still can't figure this out it's so silly =/
EDIT: Alright, the error I'm getting when trying to update is:
error: The following untracked working tree files would be overwritten by merge:
Please move or remove them before you can merge.
I removed those files (which is just stupid because they come with the edit), and now I'm back to this stupid editor again where it's coming up with a bunch of stuff that I never edited saying I have to resolve them.....
EDIT: Alright, basically said do whatever you want to the program and think I solved it, stuff seems to be working and it all says it's up to date. Will see next time Toresh updates if it's working I guessPosted 2 years ago - #24
@ toeler: i guess you missed the commit after overwriting the repo files with those from your ui folder.
And to be clear... Git is not intended to be user friendly like windows update. Git is a software development tool and nothing else.
The problem is, that at the point when you edit things outside your config.lua, you modify the software in a way that is not supported by the software itself.
In fact you can regard your modification as a little brother ( or sister ) of the software. In software development this is called a fork.
all "edits" on this page are forks from tukui.
If I decide to move the lootroll window in my version. it is basically Kenshi's edit, even if i changed only one line.
But no back to topic, imagine someone like elv22 who has a strongly customized edit would implement every update from tuk manually?
Or in even larger software projects? It would become impossible.
With git you have automatic updates where possible, and guided manually updates where necessary.
I can just strongly advice everyone who has problems with it to read some tutorials about git.
And if you decide it's not what you have been looking for, just don't use it... You can update your Tukui by yourself even if it takes some time.
This guide has been made because so many asked for it. Git is not overly complex but it is also not click and done ;) and this guide should describe the typical process of updating with git. It even uses TortoiseGit, because clicking is more "userfriendly" than the command line for unexperienced users. And not everyone here is familiar with software development tools :)
And as the last comment, there will never be a tool, that updates your edits with one click. If you think curseclient is such a tool, your are totaly wrong.Posted 2 years ago - #25
I just tried to update my friends Elv22 from version 2.7.4 to 3 beta and it worked fine. The problem there cant be any software like Curse is, because in addons you can update via curseclient are done differently, they save every change you do to WTF/Account folder. I found tukui better cos you can customise almost everything when you know a bit about lua. The guide I wrote should be clear enough.
For Toeler: Your only problem is you didnt make the change in github link - it should be something like git://github.com/Toresh/Tukui.git . It´s not the problem with the guide, it´s the problem with not following steps properlly or not reading everything. You cant update Toresh´s edit from Tukz github.Posted 2 years ago - #26
I was using Toresh's github. I was definitely following the guide to the letter. The problem was most likely in picking what to hard reset the master to, then completing the first update. After sorting that I should be fine with future updates, but we'll see how it goes.Posted 2 years ago - #27
Ah ok, sorry then. Have you managed to update then?Posted 2 years ago - #28
So I realised that since I am updating to v3 of Elv Ui. I don't need the extra folder anymore.
I put the .git file from the directory into my addons folder.
Now I can just right click my Addons folder (it has the green check mark) click pull and my UI is updated.
No need to copy directories anymore.Posted 2 years ago - #29
Ah ok, sorry then. Have you managed to update then?
I managed to update from Toresh's 2.12 to 2.14 with my edits, so next time he updates I should be able to go to 2.15. I just hope that I don't have to resolve almost every file again =/ I've only edited 2...Posted 2 years ago - #30
You must log in to post.