github-mirror/oh-my-fish
2
0
Fork 0
mirror of https://github.com/oh-my-fish/oh-my-fish.git synced 2024-11-22 15:35:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Be more careful about restoring backups (fix #509)

Browse Source
This commit is contained in:
Stephen M. Coakley 2017-05-16 09:52:57 -05:00
parent bc8f3142f1
commit 5eb63f5dfc
No known key found for this signature in database
GPG Key ID: 91B59C18494C4FC0
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -34,7 +34,7 @@ fish install --path=~/.local/share/omf --config=~/.config/omf
You can verify the integrity of the downloaded installer by verifying the script against [this checksum](bin/install.sha256): You can verify the integrity of the downloaded installer by verifying the script against [this checksum](bin/install.sha256):
``` ```
f2e24da717a9399ebb6a2e78f16627b99b6a0c31aba9123542472de94d9d6da6 install 92ca680df48640e744b361d376194c5f5f8d6b4f1ac775d22417a0d8a8108767 install
``` ```
You can also install Oh My Fish with Git or with an offline source tarball downloaded from the [releases page][releases]: You can also install Oh My Fish with Git or with an offline source tarball downloaded from the [releases page][releases]:

11
bin/install
View File

@ -373,7 +373,6 @@ function uninstall_omf
end end
# Restore backed-up files # Restore backed-up files
restore_backup_file "$FISH_CONFIG/config.fish"
restore_backup_file "$FISH_CONFIG/functions/fish_prompt.fish" restore_backup_file "$FISH_CONFIG/functions/fish_prompt.fish"
say "Uninstall complete" say "Uninstall complete"
@ -411,9 +410,13 @@ function restore_backup_file -a file_path
set -l backup_file_path (echo $backup_file_list | command tr ' ' '\n' | command sort -r | command head -1) set -l backup_file_path (echo $backup_file_list | command tr ' ' '\n' | command sort -r | command head -1)
if test -e "$backup_file_path" if test -e "$backup_file_path"
say "Restoring backup file to $path/$file" say "Found a backup of $file at $backup_file_path"
command mv "$backup_file_path" "$path/$file" ^/dev/null
or abort "Could not restore backup $backup_file_path" if confirm "Would you like to restore it (overwrite existing)?"
say "Restoring backup file to $path/$file"
command mv "$backup_file_path" "$path/$file" ^/dev/null
or abort "Could not restore backup $backup_file_path"
end
end end
end end

2
bin/install.sha256
View File

@ -1 +1 @@
f2e24da717a9399ebb6a2e78f16627b99b6a0c31aba9123542472de94d9d6da6 install 92ca680df48640e744b361d376194c5f5f8d6b4f1ac775d22417a0d8a8108767 install