-
Notifications
You must be signed in to change notification settings - Fork 889
Conversation
…scripts along with also copying over their dependency (google#303)
… install directory (google#303)
Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). 📝 Please visit https://cla.developers.google.com/ to sign. Once you've signed (or fixed any issues), please reply here (e.g. What to do if you already signed the CLAIndividual signers
Corporate signers
ℹ️ Googlers: Go here for more info. |
I signed the cla, also tagging #303 to get the link |
CLAs look good, thanks! ℹ️ Googlers: Go here for more info. |
Seeing this error pop up when running from installation directory:
Seems like it's looking for |
Can you copy the version.txt file when you're copying the uninstall files? |
Yes; however, I think we'll still run into issues since the |
I can live with that. |
Just about to push up the documentation changes that I forgot to add originally. Do we need to update the wiki as well? |
…m the installation directory (google#303)
Good catch. We should update the wiki as well, though we should wait until this PR is merged. There's no way to attach a wiki update to a PR. |
…install so as to allow the uninstall scripts to state the version of the product (google#303)
Let's add description referencing the bug being fixed and verification steps: (ex. Install OpenGEE using scripts, ... Verify that un-installation scripts (uninstall_fusion.sh, ...) are now in opt/google, Install Fusion and Server using those scripts, Verify that OpenGEE is removed ...etc.) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Had few comments
<li>Navigate to the location at which you initially cloned the GEE git repo.</li> | ||
<li>Within the GEE git repo, navigate to <code>earthenterprise/earth_enterprise/src/installer</code> | ||
and run the <code>uninstall_fusion.sh</code> and <code>uninstall_server.sh</code> scripts.</li></ol></div> | ||
<li>Navigate to the location at which you initially cloned the GEE git repo or to the installation location (<code>/opt/google</code>).</li> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's add this enhancement to release notes (5.3.0/answer/7160007.html
) under New Features
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done regarding adding that to new features
regarding the bug half of this pr, does it need to be listed under the resolved issues section?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what was the bug ? this was a feature enhancement.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes we need to log that issue then documented that it was fixed under resolved issue
<li>Navigate to the location at which you initially cloned the GEE git repo.</li> | ||
<li>Within the GEE git repo, navigate to <code>earthenterprise/earth_enterprise/src/installer</code> | ||
and run the <code>uninstall_fusion.sh</code> and <code>uninstall_server.sh</code> scripts.</li></ol></div> | ||
<li>Navigate to the location at which you initially cloned the GEE git repo or to the installation location (<code>/opt/google</code>).</li> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's document that the now the scripts to un-install can be run from opt/google
in https://github.com/google/earthenterprise/wiki/Install-Fusion-or-Earth-Server
under section Uninstalling GEE fusion and server
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I asked about this, but @tst-lsavoie wants to wait until the PR is merged before making this change.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Realized that I could provide a draft:
Run uninstall scripts from earthenterprise/earth_enterprise/src/installer
or from /opt/google/install
if you have it installed.
sudo ./uninstall_fusion.sh
sudo ./uninstall_server.sh
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just to confirm, I think it's safest to wait on changing the wiki until the PR is merged since there's no way to peg a wiki change to a specific PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good.
Completed adding the description @tst-nfarah |
<li>Within the GEE git repo, navigate to <code>earthenterprise/earth_enterprise/src/installer</code> | ||
and run the script <code>uninstall_server.sh</code>.</li></ol></div> | ||
</ul><div class="footer"><p class="BackToTop"><a href="#top_of_file">Back to top</a> <hr /></p> <p class="copyright">©2015 Google</p></div> | ||
<li>Navigate to the location at which you initially cloned the GEE git repo or to the installation location (<code>/opt/google</code>).</li> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same comment on the other document.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've added some minor comments but overall this looks good. I've also tested the changes with no issues.
This PR has gotten caught up in the release process. We just created the branch for release 5.3.0, which means that this change is now going into release 5.3.1. That means that the documentation and release notes changes need to be moved to the 5.3.1 versions of those documents. I know that's a bit of a pain; one of us can take care of it if you prefer.
So there's good news and bad news. 👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there. 😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request. Note to project maintainer: This is a terminal state, meaning the ℹ️ Googlers: Go here for more info. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I backed out the doc changes from 5.3.0 so they can be done in the 5.3.1 folder instead. So, this PR can go ahead and be merged.
* 'master' of https://github.com/google/earthenterprise: 1270 Fix xml parsing in common.sh (google#1271) 1192 update openjpeg to 2.3.1 (google#1269) Documented required boost dependency for Ubuntu 14 (google#1264) [WIP] Resolve issue google#798 - investigate Qt build performance (google#1245) Copy uninstall scripts (google#1232) refresh commit Issue google#1255 - Limits internal version string to 3 parts to fix various errors with patch releases (google#1256) Move build number to release rpm (google#1252) fix version link up 5.3.1 doc folder (google#1249) I1246 create 5.3.1 doc folder from copy of 5.3.0 doc folder (google#1248) change version files over to 5.3.1 (google#1247) start of 5.3.1 Fixes google#279 - Admin Console password will be preserved on GEE server upgrade (google#1243) google#1201 - Fix issue with setting source date when using .kip directories (google#1234) I1228 Add y-scroll-bar to GLC Assembly webpage (google#1230) google#1236 Polygons constructor can accept KML as a string (google#1239) I1225 Re-add GROUPNAME to install_server.sh (google#1233)
This PR solves #303 which is to copy the uninstall scripts over to
/opt/google
so that the user can uninstall the program without having to keep around the source code. In particular, the changes make it so that the uninstall scripts and their dependencies are moved over to the/common
directory during the staging process, and then during the install process the installation script moves over its respective uninstall script along with thecommon.sh
dependency to the/install
directory. Theversion.txt
dependency is moved to the base/opt/google
directory since the uninstall scripts look for that file in the superdirectory from where they are.As part of the development process, I and @tst-lsavoie discovered a bug with
khEnvironment.py
where we didn't check to see if a builder existed before we tried to use it in the alias function. This PR includes a fix for that bug since it was a blocker on implementing the PR.Verification:
/common
subdirectory in the staging area.version.txt
should be in the base/opt/google
directory,common.sh
should be in/install
along with the respective uninstall script for whichever install scripts you ran./opt/google
should be empty besidesversion.txt
and the/install
directory. If both are installed and only one product is uninstalled, then/opt/google
should only be missing whatever is taken away but leaving whatever is necessary for the other product to work. The uninstall scripts and their dependencies are not removed in either case since that is under the scope of Uninstall the uninstall scripts #488.