Commit b9c1bd95 authored by jeremiejig's avatar jeremiejig

Fixing how omf remove work, and omf.remove_package

destroy was broken because of a premature refresh. (giving false hang
behaviour)
parent 34686544
function omf.destroy -d "Remove Oh My Fish" function omf.destroy -d "Remove Oh My Fish"
echo (omf::dim)"Removing Oh My Fish..."(omf::off) echo (omf::dim)"Removing Oh My Fish..."(omf::off)
omf.remove_package (basename $OMF_PATH/pkg/*) >/dev/null ^&1 for pkg in (basename $OMF_PATH/pkg/*)
omf.remove_package $pkg >/dev/null ^&1
end
if test -e "$HOME/.config/fish/config.copy" if test -e "$HOME/.config/fish/config.copy"
mv "$HOME/.config/fish/config".{copy,fish} mv "$HOME/.config/fish/config".{copy,fish}
......
function omf.remove_package function omf.remove_package
for pkg in $argv set -l pkg $argv
set -l remove_status 1 set -l remove_status 1
if not omf.util_valid_package $pkg if not omf.util_valid_package $pkg
...@@ -37,9 +37,8 @@ function omf.remove_package ...@@ -37,9 +37,8 @@ function omf.remove_package
if test $remove_status -eq 0 if test $remove_status -eq 0
echo (omf::em)"$pkg successfully removed."(omf::off) echo (omf::em)"$pkg successfully removed."(omf::off)
refresh
else else
echo (omf::err)"$pkg could not be found"(omf::off) 1^&2 echo (omf::err)"$pkg could not be found"(omf::off) 1^&2
end end
end return $remove_status
end end
...@@ -120,7 +120,7 @@ function omf -d "Oh My Fish" ...@@ -120,7 +120,7 @@ function omf -d "Oh My Fish"
echo "Usage: $_ "(omf::em)"$argv[1]"(omf::off)" <[package|theme] name>" 1^&2 echo "Usage: $_ "(omf::em)"$argv[1]"(omf::off)" <[package|theme] name>" 1^&2
return $OMF_INVALID_ARG return $OMF_INVALID_ARG
end end
omf.remove_package $argv[2..-1] omf.remove_package $argv[2] ; and refresh
case "u" "up" "upd" "update" case "u" "up" "upd" "update"
pushd $OMF_PATH pushd $OMF_PATH
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment