CXX-2988 Use Bash and shebangs whenever able #1179
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Forgot to push updated commits prior to posting PR: rebased accordingly. |
kevinAlbs
approved these changes
Jul 25, 2024
rcsanchez97
approved these changes
Jul 26, 2024
generate_uninstall/CMakeLists.txt
Outdated
|
|
||
| # Ensure generated uninstall script has executable permissions. | ||
| if (\"${CMAKE_VERSION}\" VERSION_GREATER_EQUAL \"3.19.0\") | ||
| file( |
There was a problem hiding this comment.
Suggested change
| file( | |
| file ( |
generate_uninstall/CMakeLists.txt
Outdated
| ) | ||
| else () | ||
| # Workaround lack of file(CHMOD). | ||
| file( |
There was a problem hiding this comment.
Suggested change
| file( | |
| file ( |
generate_uninstall/CMakeLists.txt
Outdated
| GROUP_READ GROUP_EXECUTE | ||
| WORLD_READ WORLD_EXECUTE | ||
| ) | ||
| file(RENAME \"${UNINSTALL_PROG}.d/${UNINSTALL_PROG}\" \"${UNINSTALL_PROG}\") |
There was a problem hiding this comment.
Suggested change
| file(RENAME \"${UNINSTALL_PROG}.d/${UNINSTALL_PROG}\" \"${UNINSTALL_PROG}\") | |
| file (RENAME \"${UNINSTALL_PROG}.d/${UNINSTALL_PROG}\" \"${UNINSTALL_PROG}\") |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves CXX-2988. Verified by this patch.
Companion PR to mongodb/mongo-c-driver#1680.
Additionally removes some stray env vars and a long-broken
sedcommand in theuninstall_checktasks due to a combination of CXX-2753 (directory restructure) and CXX-2809 (removal of legacy CMake packages).The
etc/generate_uninstall.shscript is excluded from the shebang update tobash. It remains anshscript due to incompatibilities with how Bash escapes a sequence of backslashes\\\\in strings. This results in incorrect contents of the generateduninstall.shfile. The following diffs are examples of incorrect changes produced bysh->bash:Missing escape backslashes:
Failure to expand newlines prior to sort and iteration:
Refactoring the
etc/generate_uninstall.shscript to be Bash-compatible (or revisiting its method of generation entirely) is deferred to CXX-3073.