search

openUC2 / UC2-Software-GIT

This repository hosts all necessary software for the UC2 project.
https://useetoo.org
Other
13 stars 6 forks source link

Update GUI install instructions #14

Closed AlecVercruysse closed 4 years ago

AlecVercruysse commented 4 years ago
AlecVercruysse commented 4 years ago

fixes #13

renerichter commented 4 years ago

Dear Alec, due to some internal problems regarding interfacing GITHUB some non-necessary commits were done and the commit-registry was scrumbled. Hence, I ended up force-pushing my local-state over origin:MASTER which accidentally led to your pull-requests (and merge) not being included anymore. Now I wonder: Do you have an elegant idea how we can avoid as many reverting and cherry-picking as possible and just get your PUSH easily in there again?

Sorry for the inconvenience.

Best regards René

Am Fr., 3. Juli 2020 um 09:25 Uhr schrieb Alec notifications@github.com:

@AlecVercruysse commented on this pull request.

In GUI/RASPBERRY_PI/SCRIPTS/SETUP_UC2env/00-UC2_Prerequisites.sh https://github.com/bionanoimaging/UC2-Software-GIT/pull/14#discussion_r449420374 :

@@ -2,6 +2,6 @@

echo [UC2] Loading variables...

USER_HOME_DIR="/home/$USER"

-WORKING_DIR="${USER_HOME_DIR}/UC2/SCRIPTS"

+WORKING_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"

⬇️ Suggested change

-WORKING_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"

+WORKING_DIR="$(pwd)"

In GUI/RASPBERRY_PI/SCRIPTS/SETUP_UC2env/00-UC2_Prerequisites.sh https://github.com/bionanoimaging/UC2-Software-GIT/pull/14#discussion_r449420925 :

-WORKING_DIR="${USER_HOME_DIR}/UC2/SCRIPTS"

+WORKING_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"

Good point. We can avoid any issues with the user using a different directory structure/running from a different dir by just evaluating pwd.

— You are receiving this because you commented. Reply to this email directly, view it on GitHub https://github.com/bionanoimaging/UC2-Software-GIT/pull/14#pullrequestreview-442200601, or unsubscribe https://github.com/notifications/unsubscribe-auth/AEXLFM6OPRLGNCREFI6E3CLRZWBYJANCNFSM4ON5JZVQ .

-- 

Phd-stud. René Lachmann
R182, FA8, Biomedical Imaging
Leibniz Institute of Photonic Technology,
Albert-Einstein Str. 9, 07745 Jena, Germany
Tel.: +49 (0) 3641 206 426
AlecVercruysse commented 4 years ago

I get a 442 server error when I try to resubmit my PR, even though github says the branches can merge automatically. I've filed a support ticket for now. If they say it is not possible due to the forced changes in history, I will just quickly rewrite them.

renerichter commented 4 years ago

Thank you for your efforts! Any response already? :)

2020年7月16日(木) 21:38 Alec notifications@github.com:

I get a 442 server error when I try to resubmit my PR, even though github says the branches can merge automatically. I've filed a support ticket for now. If they say it is not possible due to the forced changes in history, I will just quickly rewrite them.

— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub https://github.com/bionanoimaging/UC2-Software-GIT/pull/14#issuecomment-659627143, or unsubscribe https://github.com/notifications/unsubscribe-auth/AEXLFM4UXTMGGQ6ITC5M3FLR35JMZANCNFSM4ON5JZVQ .

beniroquai commented 4 years ago

Sorry for the problems which came up by merging using the github desktop thingy. I'll push everything to the devBD branch for now. My fault.

renerichter commented 4 years ago

Any changes regarding the topic?

Am Do., 16. Juli 2020 um 21:38 Uhr schrieb Alec notifications@github.com:

I get a 442 server error when I try to resubmit my PR, even though github says the branches can merge automatically. I've filed a support ticket for now. If they say it is not possible due to the forced changes in history, I will just quickly rewrite them.

— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub https://github.com/bionanoimaging/UC2-Software-GIT/pull/14#issuecomment-659627143, or unsubscribe https://github.com/notifications/unsubscribe-auth/AEXLFM4UXTMGGQ6ITC5M3FLR35JMZANCNFSM4ON5JZVQ .

-- 

Phd-stud. René Lachmann
R182, FA8, Biomedical Imaging
Leibniz Institute of Photonic Technology,
Albert-Einstein Str. 9, 07745 Jena, Germany
Tel.: +49 (0) 3641 206 426
AlecVercruysse commented 4 years ago

No comments on the ticket, but I tried again just for a last ditch attempt and it worked! #15.

renerichter commented 4 years ago

Very nice! Thank you for your help in this issue!

Am Mo., 20. Juli 2020 um 18:17 Uhr schrieb Alec notifications@github.com:

No comments on the ticket, but I tried again just for a last ditch attempt and it worked! #15 https://github.com/bionanoimaging/UC2-Software-GIT/pull/15.

— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub https://github.com/bionanoimaging/UC2-Software-GIT/pull/14#issuecomment-661145218, or unsubscribe https://github.com/notifications/unsubscribe-auth/AEXLFMZYVMMUDNBB74QRYODR4RUYRANCNFSM4ON5JZVQ .

-- 

René Richter
R184, FA8-2, Biomedical Imaging
Leibniz Institute of Photonic Technology,
Albert-Einstein Str. 9, 07745 Jena, Germany
Tel.: +49 (0) 3641 206 303