h3n3/kiauh
1
0
Fork 0
Code Issues 46 Pull Requests 10 Packages Projects Releases Wiki Activity

Updating KIAUH Script fails #63

New Issue
Closed
opened 2021-01-23 09:25:25 +01:00 by nicedevil007 · 11 comments
nicedevil007 commented 2021-01-23 09:25:25 +01:00 (Migrated from github.com)
Copy Link

Heya just noticed that you updated the KIAUH script and I should type "update" in the menu to update it.

/=======================================================\
|     ~~~~~~~~~~~~~~~~~ [ KIAUH ] ~~~~~~~~~~~~~~~~~     |
|        Klipper Installation And Update Helper         |
|     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~     |
\=======================================================/

###### Updating KIAUH ...
Updating 43a724b..bb0eb69
error: Your local changes to the following files would be overwritten by merge:
        scripts/install_klipperscreen.sh
Please commit your changes or stash them before you merge.
Aborting

Leaded to this.

Heya just noticed that you updated the KIAUH script and I should type "update" in the menu to update it. ``` /=======================================================\ | ~~~~~~~~~~~~~~~~~ [ KIAUH ] ~~~~~~~~~~~~~~~~~ | | Klipper Installation And Update Helper | | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | \=======================================================/ ###### Updating KIAUH ... Updating 43a724b..bb0eb69 error: Your local changes to the following files would be overwritten by merge: scripts/install_klipperscreen.sh Please commit your changes or stash them before you merge. Aborting ``` Leaded to this.
nicedevil007 commented 2021-01-23 09:30:06 +01:00 (Migrated from github.com)
Copy Link

Fixed it by myself with deletion of the old install_klipperscreen.sh, but this wasn't edited by myself before o_O

Fixed it by myself with deletion of the old install_klipperscreen.sh, but this wasn't edited by myself before o_O
dw-0 commented 2021-01-23 09:30:15 +01:00 (Migrated from github.com)
Copy Link

The error message states, that you have made changes to the file install_klipperscreen.sh.
If you modify a script yourself, it can't be updated anymore that easily.

The error message states, that you have made changes to the file `install_klipperscreen.sh`. If you modify a script yourself, it can't be updated anymore that easily.
KwadFan commented 2021-01-23 09:47:50 +01:00 (Migrated from github.com)
Copy Link

I am facing the same Issue. I haven't made any changes accordingly. My Solution was a bit rough but it worked.
git reset --hard
Cheers

I am facing the same Issue. I haven't made any changes accordingly. My Solution was a bit rough but it worked. ```git reset --hard``` Cheers
dw-0 commented 2021-01-23 10:09:19 +01:00 (Migrated from github.com)
Copy Link

Okay that is weird.
The file got updated 2 days ago, but that shouldn't create any issue. I have no idea why git then complains about some (rather) non-existent local changes. I try and investigate this issue.

Okay that is weird. The file got updated 2 days ago, but that shouldn't create any issue. I have no idea why git then complains about some (rather) non-existent local changes. I try and investigate this issue.
dw-0 commented 2021-01-23 10:22:43 +01:00 (Migrated from github.com)
Copy Link

@nicedevil007 so you updated your kiauh from 43a724b80e . that was a point in history where the install_klipperscreen.sh fix wasn't applied yet. Are you sure you haven't modified the file yourself before.
In https://github.com/th33xitus/kiauh/issues/59 you said, you updated kiauh after that patch from jordan was provided and i merged it. But that would mean, your kiauh would be already PAST commit 43a724b80e.

@KwadFan From which commit did you make the update? The same as nicedevil?

i just updated my own kiauh on my production pi...

went through without an issue. and i had that klipperscreen fix already applied as well as you can see because the update startet from 8bf20aa059

@nicedevil007 so you updated your kiauh from 43a724b80eae386a4c17b2d8582f4f11bbf9b9e6 . that was a point in history where the install_klipperscreen.sh fix wasn't applied yet. Are you sure you haven't modified the file yourself before. In https://github.com/th33xitus/kiauh/issues/59 you said, you updated kiauh after that patch from jordan was provided and i merged it. But that would mean, your kiauh would be already PAST commit 43a724b80eae386a4c17b2d8582f4f11bbf9b9e6. @KwadFan From which commit did you make the update? The same as nicedevil? i just updated my own kiauh on my production pi... ![](http://puu.sh/H9HPf/fda17edb11.png) went through without an issue. and i had that klipperscreen fix already applied as well as you can see because the update startet from 8bf20aa05912524beaff2560981584d31c5ec7e4
KwadFan commented 2021-01-23 10:28:30 +01:00 (Migrated from github.com)
Copy Link

It was commit f1289504

It was commit f1289504
dw-0 commented 2021-01-23 10:39:35 +01:00 (Migrated from github.com)
Copy Link

@KwadFan okay so you haven't updated for a longer time then. That makes troubleshooting a bit more complicated.

Especially now that i got a screenshot from someone who updated successfully exactly after 43a724b80e

and someone who updates successfully after a44ae4c2b9

At the moment i don't have an idea where to look for the issue? It seems very random to me

@KwadFan okay so you haven't updated for a longer time then. That makes troubleshooting a bit more complicated. Especially now that i got a screenshot from someone who updated successfully exactly after 43a724b80eae386a4c17b2d8582f4f11bbf9b9e6 ![](http://puu.sh/H9I0e/22cfaaafaf.png) and someone who updates successfully after a44ae4c2b993f7d341eae8e9435dd6e3f8adb7b4 ![](http://puu.sh/H9I32/0de54067d5.png) At the moment i don't have an idea where to look for the issue? It seems very random to me
nicedevil007 commented 2021-01-23 11:14:42 +01:00 (Migrated from github.com)
Copy Link

@nicedevil007 so you updated your kiauh from 43a724b . that was a point in history where the install_klipperscreen.sh fix wasn't applied yet. Are you sure you haven't modified the file yourself before.
In #59 you said, you updated kiauh after that patch from jordan was provided and i merged it. But that would mean, your kiauh would be already PAST commit 43a724b.

@KwadFan From which commit did you make the update? The same as nicedevil?

i just updated my own kiauh on my production pi...

went through without an issue. and i had that klipperscreen fix already applied as well as you can see because the update startet from 8bf20aa

I'm pretty sure that I didn't do that even by accident... can't remember that I ever went into the scripts folder in the kiauh directory...

for me it doesn't matter anymore, because fixed it with the deletion of the klipperscreen install script inside the scripts folder. maybe it is a rare behaviour I got... or even anything else is wrong on my installation (remember that I can't install klipperscreen with the pi user before)

now with the updated KIAUH script it seems that KIAUH recognizes the installation of klipperscreen even if it was installed with root user. I was able to update it through your script! so maybe everything is fixed now? <3

> @nicedevil007 so you updated your kiauh from [43a724b](https://github.com/th33xitus/kiauh/commit/43a724b80eae386a4c17b2d8582f4f11bbf9b9e6) . that was a point in history where the install_klipperscreen.sh fix wasn't applied yet. Are you sure you haven't modified the file yourself before. > In #59 you said, you updated kiauh after that patch from jordan was provided and i merged it. But that would mean, your kiauh would be already PAST commit [43a724b](https://github.com/th33xitus/kiauh/commit/43a724b80eae386a4c17b2d8582f4f11bbf9b9e6). > > @KwadFan From which commit did you make the update? The same as nicedevil? > > i just updated my own kiauh on my production pi... > ![](https://camo.githubusercontent.com/648874375c8cbde0dc4a8613cba66b71e94f69159dd69afeda444e9a47c97de6/687474703a2f2f7075752e73682f48394850662f666461313765646231312e706e67) > > went through without an issue. and i had that klipperscreen fix already applied as well as you can see because the update startet from [8bf20aa](https://github.com/th33xitus/kiauh/commit/8bf20aa05912524beaff2560981584d31c5ec7e4) I'm pretty sure that I didn't do that even by accident... can't remember that I ever went into the scripts folder in the kiauh directory... for me it doesn't matter anymore, because fixed it with the deletion of the klipperscreen install script inside the scripts folder. maybe it is a rare behaviour I got... or even anything else is wrong on my installation (remember that I can't install klipperscreen with the pi user before) now with the updated KIAUH script it seems that KIAUH recognizes the installation of klipperscreen even if it was installed with root user. I was able to update it through your script! so maybe everything is fixed now? <3
KwadFan commented 2021-01-23 13:28:20 +01:00 (Migrated from github.com)
Copy Link

@th33xitus
Yes, not running latest and greatest brings sometimes major issue to the table.
Updates haven get the Attention they should have on my printer :)

In my opinion, I would brute force the update like
git reset --hard
because in my mind KIAUH shouldnt be modified, unless you know what are you doing.
And at this point you should know to prevent such Errors or even to deal with them.
Its more curious for lazy people or peoples without the technical background in mind of Linux Administration and Shell scripting.
So these last named should live with the circumstance that you made the Update rules. Period.
So, if you ask me, brute force the Update to prevent such randomly happening Issues.
I think this issue could be closed for now.
Regards.

@th33xitus Yes, not running latest and greatest brings sometimes major issue to the table. Updates haven get the Attention they should have on my printer :) In my opinion, I would brute force the update like ```git reset --hard``` because in my mind KIAUH shouldnt be modified, unless you know what are you doing. And at this point you should know to prevent such Errors or even to deal with them. Its more curious for lazy people or peoples without the technical background in mind of Linux Administration and Shell scripting. So these last named should live with the circumstance that you made the Update rules. Period. So, if you ask me, brute force the Update to prevent such randomly happening Issues. I think this issue could be closed for now. Regards.
dw-0 commented 2021-01-23 14:44:11 +01:00 (Migrated from github.com)
Copy Link

So, if you ask me, brute force the Update to prevent such randomly happening Issues.

You idea is good. I think i will implement such brute force reset. I agree with you in every point you mention.

> So, if you ask me, brute force the Update to prevent such randomly happening Issues. You idea is good. I think i will implement such brute force reset. I agree with you in every point you mention.
dw-0 commented 2021-01-23 16:41:00 +01:00 (Migrated from github.com)
Copy Link

30ca396772 should solve this issue from now on.
Although i still would like to know why that occurred suddenly...

https://github.com/th33xitus/kiauh/commit/30ca3967725bc98d13dfb80be26493b3f16f5e90 should solve this issue from now on. Although i still would like to know why that occurred suddenly...
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
🐛 bug
Something isn't working
 can't reproduce
➕ community extension
crowsnest
duplicate
This issue or pull request already exists
 ✨ feature request
New feature or request
 fluidd
Something that is fluidd related
 improvement
improvement of existing features/code
 invalid
klipper
Something that is klipper related
 klipperscreen
Something that is klipperscreen related
 mainsail
Something that is mainsail related
 mobileraker
moonraker
Something that is moonraker related
 not kiauh
not planned
octoeverywhere
Something that is OctoEverywhere related
 ❓ question
Further information is requested
 💤 stale
todo
wontfix
This will not be worked on
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
h3n3
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: h3n3/kiauh#63
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?