Skip to content

Commit 0b4e635

Browse files
committed
Support --global,-g on fvm deactivate
1 parent b239287 commit 0b4e635

File tree

1 file changed

+12
-16
lines changed

1 file changed

+12
-16
lines changed

fvm.sh

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ fvm() {
488488
fvm_echo ' fvm uninstall <version> Uninstall a version'
489489
fvm_echo ' fvm use <version> Modify PATH to use flutter <version>.'
490490
fvm_echo ' The following optional arguments:'
491-
fvm_echo ' -g,--global Modify global default flutter <version>.'
491+
fvm_echo ' -g,--global Set global default flutter <version>.'
492492
fvm_echo ' fvm current Display currently activated version of Flutter.'
493493
fvm_echo ' fvm link <version> Create a soft link ".flutter" to <version> of Flutter.'
494494
fvm_echo ' fvm ls [<version>] List installed versions, matching a given <version> if provided'
@@ -498,7 +498,8 @@ fvm() {
498498
fvm_echo ' --no-beta Exclude beta released versions'
499499
fvm_echo ' --no-dev Exclude dev released versions'
500500
fvm_echo ' fvm deactivate Undo effects of `fvm` on current shell'
501-
fvm_echo ' --silent Silences stdout/stderr output'
501+
fvm_echo ' The following optional arguments:'
502+
fvm_echo ' -g,--global Unset global default flutter <version>.'
502503
fvm_echo ' fvm unload Unload `fvm` from shell'
503504
fvm_echo 'Example:'
504505
fvm_echo ' fvm install 3.0 Install the lastest 3.0.x version of flutter'
@@ -678,41 +679,36 @@ fvm() {
678679
fvm_echo 'v0.1.0'
679680
;;
680681
"deactivate")
681-
local FVM_SILENT
682+
local FVM_GLOBAL
682683
while [ $# -ne 0 ]; do
683684
case "${1}" in
684-
--silent) FVM_SILENT=1 ;;
685+
-g | --global) FVM_GLOBAL=1 ;;
685686
--) ;;
686687
esac
687688
shift
688689
done
689690
local NEWPATH
690691
NEWPATH="$(fvm_strip_path "${PATH}" "/bin")"
691692
if [ "_${PATH}" = "_${NEWPATH}" ]; then
692-
if [ "${FVM_SILENT:-0}" -ne 1 ]; then
693-
fvm_err "Could not find ${FVM_DIR}/*/bin in \${PATH}"
694-
fi
693+
fvm_err "Could not find ${FVM_DIR}/*/bin in \${PATH}"
695694
else
696695
export PATH="${NEWPATH}"
697696
hash -r
698-
if [ "${FVM_SILENT:-0}" -ne 1 ]; then
699-
fvm_err "${FVM_DIR}/*/bin removed from \${PATH}"
700-
fi
697+
fvm_err "${FVM_DIR}/*/bin removed from \${PATH}"
701698
fi
702699

703700
if [ -n "${MANPATH-}" ]; then
704701
NEWPATH="$(fvm_strip_path "${MANPATH}" "/share/man")"
705702
if [ "_${MANPATH}" = "_${NEWPATH}" ]; then
706-
if [ "${FVM_SILENT:-0}" -ne 1 ]; then
707-
fvm_err "Could not find ${FVM_DIR}/*/share/man in \${MANPATH}"
708-
fi
703+
fvm_err "Could not find ${FVM_DIR}/*/share/man in \${MANPATH}"
709704
else
710705
export MANPATH="${NEWPATH}"
711-
if [ "${FVM_SILENT:-0}" -ne 1 ]; then
712-
fvm_err "${FVM_DIR}/*/share/man removed from \${MANPATH}"
713-
fi
706+
fvm_err "${FVM_DIR}/*/share/man removed from \${MANPATH}"
714707
fi
715708
fi
709+
if [ "${FVM_GLOBAL}" = "1" ]; then
710+
command rm "${FVM_DIR}/flutter.version"
711+
fi
716712
;;
717713
"unload")
718714
fvm deactivate >/dev/null 2>&1

0 commit comments

Comments
 (0)