simplify install #1830
Merged
simplify install #1830
Conversation
This file contains 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
added 3 commits
February 6, 2021 00:15
This helps us make the logic easier to read, and remove unneeded confusion.
This will ensure users will specify whether they want to overwrite the backup or not, and check it even when we do silent installation This does change the default behaviour and exits if the -f flag is not specified and a backup is present.
NoahGorny
force-pushed
the
simplify-install
branch
from
3d7c279
to
af17501
Compare
|
This fix looks like it should fix the issue |
cornfeedhobo
reviewed
Feb 5, 2021
install.sh
Outdated
| @@ -76,6 +77,69 @@ function backup_append() { | |||
| echo -e "\033[0;32mBash-it template has been added to your $CONFIG_FILE\033[0m" | |||
| } | |||
|
|
|||
| function check_for_backup() { | |||
| if ! [ -e "$HOME/$BACKUP_FILE" ]; then | |||
There was a problem hiding this comment.
double bracket test are technically safer. if we're writing or transposing new things, I'd like to push to switch
cornfeedhobo
reviewed
Feb 6, 2021
install.sh
Outdated
| @@ -76,6 +77,69 @@ function backup_append() { | |||
| echo -e "\033[0;32mBash-it template has been added to your $CONFIG_FILE\033[0m" | |||
| } | |||
|
|
|||
| function check_for_backup() { | |||
There was a problem hiding this comment.
I'm not going to road block since this in the install script, but it'd be nice to start making all functions be prefixed with _bash-it or something consistent and namespaced.
There was a problem hiding this comment.
added this prefix to all functions in install.sh
cornfeedhobo
approved these changes
Feb 6, 2021
There was a problem hiding this comment.
@NoahGorny This is the first time I've really looked at this file in detail. I can see some places we'll want to improve in the future, but this is a great fix + cleanup. Thanks for this!
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.
Description
Cleans up the config backup logic and split it into smaller functions.
Also add a new flag which allows us to overwrite backups silently (previously we did not check for existing backups in silent installations). This does change the default behaviour, so I am open to a debate on that.
Motivation and Context
#1829 prompted me to take a look- and I indeed saw a problem. I refactored the code a bit in order to fix this.
Closes #1829
How Has This Been Tested?
Locally, tested various flags and combinations, with and without backup. Works as expected.
As I said, now silent installations fail if a backup is already present, unless "-f/--overwrite-backup" is specified
Types of changes
Checklist:
clean_files.txtand formatted it usinglint_clean_files.sh.