./update.sh lost ability to transfer changes from local directory

[CRImier]

I'm now testing ./update.sh and it appears there's been a misunderstanding about what ./update.sh can do. What it used to do beforehand is:

• If it's ran from the local directory, it won't transfer the changed code from it, basically, installing a clean copy. I used to use this feature for making device-specific small changes, adding device-specific apps or temporarily testing things in real-world situations before merging them into master. The workflow was as follows:
  • make changes
  • run ./update.sh
  • changes would be transferred to the project directory, along with
• It also doesn't preserve any config files - including config.json files, so, as of now, the installation updated with ./update.sh will fail to start because of missing config.json.

The last thing is especially bad (since it breaks existing ZPUI installs), so I'll work around it right now.

[CRImier]

One more thing that changed is - now it only pulls from the master branch. So, if the local install is on the devel branch and there are breaking changes compared to master (which is very likely), the script will fail.

I think I didn't clarify the script's usecases enough. It's useful during development when used from the local directory, mainly for:

• getting changes from remote of the current branch and deploying them using only one line (mostly working)
• deploying device-specific small changes into the system-wide ZPUI install
• adding device-specific apps
• temporary testing

The current fix removes the temporary directory feature, as well as removes the explicit usage of "master" branch. It fixes the problems, but obviously it's a step back. I don't yet fully understand what'd be the best way to resolve this problem, so the question is to @monsieurh - what's your take on this?

[monsieurh]

I submitted a PR for a port of update.sh in python, doesn't deal with the 'changed code' issue though. Gotta think about it.

[CRImier]

The update app doesn't actually need to rsync from local directory to the install directory - because the update app is only meant to be run from the install directory (while ZPUI is being ran as a service). In fact, the update app isn't even supposed to know about the local directory =)

[monsieurh]

Not quite sure about what you mean here : can you elaborate ? If you're talking about the python version : at some point during the update two repository exists : one in /opt/zpui the other in /tmp/zpui_update. However, they don't contain the same files. Since a git clone is used to create /tmp/zpui_update, so any uncommited file isn't cloned (typically config files).

That's something that's not dealt with yet. I'm looking for ideas.