1
0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2025-12-12 15:34:50 +08:00

Compare commits

...

9 Commits

Author SHA1 Message Date
Nikolas Garofil
7a63edfeb9
Merge 01808b3aae into 72acd2ca90 2025-12-09 09:31:05 +01:00
Mohaiminus Sakib
72acd2ca90
feat(uv): add more useful aliases (#13462)
Co-authored-by: Mohaiminus Sakib <roddur093@gmail.com>
Co-authored-by: Marc Cornellà <marc@mcornella.com>
2025-12-08 16:57:50 +01:00
Nikolas Garofil
01808b3aae Fix(adduser): Better code structure 2021-12-23 21:52:55 +01:00
Nikolas Garofil
8b5f01a22c Fix(adduser): better changing of shell 2021-12-22 20:02:11 +01:00
Nikolas Garofil
f26b428f8e Fix(adduser): better returning to shell of original user 2021-12-22 19:18:04 +01:00
Nikolas Garofil
70edfaf348 Fix(adduser): better binary check 2021-12-22 19:16:50 +01:00
Nikolas Garofil
8ceff21474 Fix(adduser): correct echo redirect 2021-12-22 19:15:49 +01:00
Nikolas Garofil
510d7a778a Fix(adduser): better way to avoid adduser() recursion 2021-12-22 19:15:09 +01:00
Nikolas Garofil
ecc5aab0e7 feat(adduser): add adduser plugin (#10441)
Automatic "Oh My ZSH" installation when adding new users
2021-12-21 19:40:46 +01:00
4 changed files with 127 additions and 18 deletions

26
plugins/adduser/README.md Normal file
View File

@ -0,0 +1,26 @@
# adduser
This plugin adds support for installing "Oh My ZSH" when adding new users.
To use it, add `adduser` to the plugins array of your `~/.zshrc` file:
```zsh
plugins=(... adduser)
```
## Usage
Just run `adduser` as you normally would do and now:
1. The regular `adduser` command will run.
2. The shell of the new user will switch to zsh
3. "Oh My zsh will be installed (as if he would have ran `install.sh` himself).
## NOTES
- It is assumed that the last argument will be the username.<br>*(In rare cases people provide the group as last argument)*
- `useradd` behaviour is not changed.
## Author
[Nikolas Garofil](https://github.com/ngaro)

View File

@ -0,0 +1,70 @@
# Copyright (c) 2021 Nikolas Garofil
_adduser_result() {
local result_string="Installation of 'Oh My Zsh' for '$new_user'"
#Erase the temporary copy of the installscript when necessary
if [[ ! -z $temp_installscript ]] ; then
rm $temp_installscript
fi
#mention the result
if [[ $1 -eq 0 ]]; then
echo "$result_string succeeded."
else
echo "$result_string failed." > /dev/stderr
fi
}
adduser() {
local path_installscript="$ZSH/tools/install.sh"
local unattended_options=" --unattended"
local new_user=${@[$#]}
local temp_installscript; local unattended_installer; local install_as_user; local change_shell;
#Create user, errors will be reported by the 'real' adduser
#Don't use $new_user so that we have all args
command adduser $@ || return 1
echo "\nUser '$new_user' has been created. I will now try to install 'Oh My Zsh'"
if [[ ! -f $path_installscript ]] ; then
echo "Installationscript '$path_installscript' not available" > /dev/stderr;
_adduser_result 1
return 1;
fi
#copy install.sh to a new file in temp that we can give the right owner to execute
#and also make sure that after the install script we are no longer the new user
temp_installscript=$(mktemp)
cp $path_installscript $temp_installscript
chown $new_user $temp_installscript && chmod +x $temp_installscript
unattended_installer="$temp_installscript $unattended_options"
if [[ ( ! -x "$commands[sudo]" ) && ( ! -x "$commands[su]" ) ]] ; then
echo "You can't become $new_user (no 'sudo' or 'su' available)" > /dev/stderr;
_adduser_result 1
return 1;
fi
if [[ -x "$commands[sudo]" ]] ; then
install_as_user="sudo -u $new_user sh -c '$unattended_installer'"
change_shell="sudo chsh -s $commands[zsh] $new_user"
else
install_as_user="su -l $new_user -c '$unattended_installer'"
change_shell="su -c 'chsh -s $commands[zsh] $new_user'"
fi
eval ${install_as_user}
#mention the result before changing the shell (even with a bad result it's still installed)
if [ ! $? -eq 0 ] ; then
_adduser_result 1
return 1
fi
if [[ ! -x "$commands[chsh]" ]] ; then
echo "'chsh' is not available, change the shell manually." > /dev/stderr
fi
eval ${change_shell}
}

View File

@ -1,6 +1,7 @@
# uv plugin
This plugin automatically installs [uv](https://github.com/astral-sh/uv)'s completions for you, and keeps them up to date. It also adds convenient aliases for common usage.
This plugin automatically installs [uv](https://github.com/astral-sh/uv)'s completions for you,
and keeps them up to date. It also adds convenient aliases for common usage.
To use it, add `uv` to the plugins array in your zshrc file:
@ -10,20 +11,26 @@ plugins=(... uv)
## Aliases
| Alias | Command | Description |
|:----- |------------------------------------------------------------------------ |:-------------------------------------------------------------------- |
| uva | `uv add` | Add packages to the project |
| uvexp | `uv export --format requirements-txt --no-hashes --output-file requirements.txt --quiet` | Export the lock file to `requirements.txt` |
| uvl | `uv lock` | Lock the dependencies |
| uvlr | `uv lock --refresh` | Rebuild the lock file without upgrading dependencies |
| uvlu | `uv lock --upgrade` | Lock the dependencies to the newest compatible versions |
| uvp | `uv pip` | Manage pip packages |
| uvpy | `uv python` | Manage Python installs |
| uvpp | `uv python pin` | Pin the current project to use a specific Python version |
| uvr | `uv run` | Run commands within the project's environment |
| uvrm | `uv remove` | Remove packages from the project |
| uvs | `uv sync` | Sync the environment with the lock file |
| uvsr | `uv sync --refresh` | "Force" sync the environment with the lock file (ignore cache) |
| uvsu | `uv sync --upgrade` | Sync the environment, allowing upgrades and ignoring the lock file |
| uvup | `uv self update` | Update the UV tool to the latest version |
| uvv | `uv venv` | Manage virtual environments |
| Alias | Command | Description |
| :---- | ---------------------------------------------------------------------------------------- | :-------------------------------------------------------------------- |
| uva | `uv add` | Add packages to the project |
| uvexp | `uv export --format requirements-txt --no-hashes --output-file requirements.txt --quiet` | Export the lock file to `requirements.txt` |
| uvi | `uv init` | Initialize a new project in current workspace and environment. |
| uvinw | `uv init --no-workspace` | Initialize a new project in a new workspace and environment |
| uvl | `uv lock` | Lock the dependencies |
| uvlr | `uv lock --refresh` | Rebuild the lock file without upgrading dependencies |
| uvlu | `uv lock --upgrade` | Lock the dependencies to the newest compatible versions |
| uvp | `uv pip` | Manage pip packages |
| uvpi | `uv python install` | Install a specific version of python |
| uvpl | `uv python list` | Lists all python version installed |
| uvpp | `uv python pin` | Pin the current project to use a specific Python version |
| uvpu | `uv python uninstall` | Remove a specific version of python |
| uvpy | `uv python` | Manage Python installs |
| uvr | `uv run` | Run commands within the project's environment |
| uvrm | `uv remove` | Remove packages from the project |
| uvs | `uv sync` | Sync the environment with the lock file |
| uvsr | `uv sync --refresh` | "Force" sync the environment with the lock file (ignore cache) |
| uvsu | `uv sync --upgrade` | Sync the environment, allowing upgrades and ignoring the lock file |
| uvtr | `uv tree` | Displays the full dependency tree for the current project environment |
| uvup | `uv self update` | Update the UV tool to the latest version |
| uvv | `uv venv` | Manage virtual environments |

View File

@ -7,10 +7,15 @@ alias uv="noglob uv"
alias uva='uv add'
alias uvexp='uv export --format requirements-txt --no-hashes --output-file requirements.txt --quiet'
alias uvi='uv init'
alias uvinw='uv init --no-workspace'
alias uvl='uv lock'
alias uvlr='uv lock --refresh'
alias uvlu='uv lock --upgrade'
alias uvp='uv pip'
alias uvpi='uv python install'
alias uvpl='uv python list'
alias uvpu='uv python uninstall'
alias uvpy='uv python'
alias uvpp='uv python pin'
alias uvr='uv run'
@ -18,6 +23,7 @@ alias uvrm='uv remove'
alias uvs='uv sync'
alias uvsr='uv sync --refresh'
alias uvsu='uv sync --upgrade'
alias uvtr='uv tree'
alias uvup='uv self update'
alias uvv='uv venv'