folkslinux
/
mamba
mirror of https://github.com/mamba-org/mamba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove micromamba shell init -p (#3092) 

* Remove micromamba shell init -p

* Fix rc content
This commit is contained in:
Antoine Prouvost 2024-01-05 14:07:11 +01:00 committed by GitHub
parent 1633630e68
commit f99c4288c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libmamba/src/core/shell_init.cpp
View File

@ -352,10 +352,10 @@ namespace mamba
content << "import sys as _sys\n"; content << "import sys as _sys\n";
content << "from types import ModuleType as _ModuleType\n"; content << "from types import ModuleType as _ModuleType\n";
content << "_mod = _ModuleType(\"xontrib.mamba\",\n"; content << "_mod = _ModuleType(\"xontrib.mamba\",\n";
content << " \'Autogenerated from $($MAMBA_EXE shell hook -s xonsh -p $MAMBA_ROOT_PREFIX)\')\n"; content << " \'Autogenerated from $($MAMBA_EXE shell hook -s xonsh -r $MAMBA_ROOT_PREFIX)\')\n";
content << "__xonsh__.execer.exec($($MAMBA_EXE shell hook -s xonsh -p $MAMBA_ROOT_PREFIX),\n"; content << "__xonsh__.execer.exec($($MAMBA_EXE shell hook -s xonsh -r $MAMBA_ROOT_PREFIX),\n";
content << " glbs=_mod.__dict__,\n"; content << " glbs=_mod.__dict__,\n";
content << " filename=\'$($MAMBA_EXE shell hook -s xonsh -p $MAMBA_ROOT_PREFIX)\')\n"; content << " filename=\'$($MAMBA_EXE shell hook -s xonsh -r $MAMBA_ROOT_PREFIX)\')\n";
content << "_sys.modules[\"xontrib.mamba\"] = _mod\n"; content << "_sys.modules[\"xontrib.mamba\"] = _mod\n";
content << "del _sys, _mod, _ModuleType\n"; content << "del _sys, _mod, _ModuleType\n";
content << "# <<< mamba initialize <<<\n"; content << "# <<< mamba initialize <<<\n";
@ -947,7 +947,7 @@ def --env "micromamba deactivate" [] {
out << "# !! Contents within this block are managed by 'mamba shell init' !!\n"; out << "# !! Contents within this block are managed by 'mamba shell init' !!\n";
out << "$Env:MAMBA_ROOT_PREFIX = \"" << conda_prefix.string() << "\"\n"; out << "$Env:MAMBA_ROOT_PREFIX = \"" << conda_prefix.string() << "\"\n";
out << "$Env:MAMBA_EXE = \"" << self_exe.string() << "\"\n"; out << "$Env:MAMBA_EXE = \"" << self_exe.string() << "\"\n";
out << "(& $Env:MAMBA_EXE 'shell' 'hook' -s 'powershell' -p $Env:MAMBA_ROOT_PREFIX) | Out-String | Invoke-Expression\n"; out << "(& $Env:MAMBA_EXE 'shell' 'hook' -s 'powershell' -r $Env:MAMBA_ROOT_PREFIX) | Out-String | Invoke-Expression\n";
out << "#endregion\n"; out << "#endregion\n";
return out.str(); return out.str();
} }

4
micromamba/src/shell.cpp
View File

@ -40,9 +40,7 @@ namespace
{ {
auto& root = config.at("root_prefix"); auto& root = config.at("root_prefix");
subcmd->add_option( subcmd->add_option(
"root_prefix,-r,--root-prefix" "root_prefix,-r,--root-prefix",
// TODO deprecated, remove in 2.0.0
",--prefix,-p,--name,-n",
root.get_cli_config<fs::u8path>(), root.get_cli_config<fs::u8path>(),
root.description() root.description()
); );