From d6fd2f6d61d2d711f04f16bad5a7f1586dddc734 Mon Sep 17 00:00:00 2001 From: Fabian Ising Date: Fri, 20 Dec 2024 12:47:54 +0100 Subject: [PATCH] [all] Link examples files (instead of cp) --- setup_ubuntu.sh | 6 +++--- setup_ubuntu_shared.zsh | 6 +++--- zsh/.virtual_env_config.zsh_debian.example | 15 ++++----------- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/setup_ubuntu.sh b/setup_ubuntu.sh index eda6289..fe4b856 100755 --- a/setup_ubuntu.sh +++ b/setup_ubuntu.sh @@ -16,13 +16,13 @@ if [ $SHELL != "/bin/zsh" ]; then fi for filename in zsh/.*_debian.example; do - cp $filename ${filename:0:-15} + ln -Tsfv $PWD/$filename $PWD/${filename:0:-15} done for filename in tmux/.*_debian.example; do - cp $filename ${filename:0:-15} + ln -Tsfv $PWD/$filename $PWD/${filename:0:-15} done for filename in nvim/.*_debian.example; do - cp $filename ${filename:0:-15} + ln -Tsfv $PWD/$filename $PWD/${filename:0:-15} done diff --git a/setup_ubuntu_shared.zsh b/setup_ubuntu_shared.zsh index 0aaa880..700f8c2 100755 --- a/setup_ubuntu_shared.zsh +++ b/setup_ubuntu_shared.zsh @@ -14,13 +14,13 @@ if [ $SHELL != "/bin/zsh" ]; then fi for filename in zsh/.*_debian.example(N); do - cp $filename ${filename:0:-15} + ln -Tsfv $PWD/$filename $PWD/${filename:0:-15} done for filename in tmux/.*_debian.example(N); do - cp $filename ${filename:0:-15} + ln -Tsfv $PWD/$filename $PWD/${filename:0:-15} done for filename in nvim/.*_debian.example(N); do - cp $filename ${filename:0:-15} + ln -Tsfv $PWD/$filename $PWD/${filename:0:-15} done diff --git a/zsh/.virtual_env_config.zsh_debian.example b/zsh/.virtual_env_config.zsh_debian.example index a00dabc..ddd8213 100644 --- a/zsh/.virtual_env_config.zsh_debian.example +++ b/zsh/.virtual_env_config.zsh_debian.example @@ -1,17 +1,10 @@ export WORKON_HOME=~/python-envs +export VIRTUALENVWRAPPER_VIRTUALENV=/usr/bin/virtualenv mkdir -p $WORKON_HOME source /usr/share/virtualenvwrapper/virtualenvwrapper.sh -function workon() { - if ! { [ "$TERM" = "screen" ] && [ -n "$TMUX" ]; } then - if ! { [ -z "$1" ] } then - tmux setenv VIRTUAL_ENV "$1" - fi - source /usr/share/virtualenvwrapper/virtualenvwrapper.sh - workon "$@" - fi -} - if [ -n "$VIRTUAL_ENV" ]; then - workon $VIRTUAL_ENV + if [[ -f "$VIRTUAL_ENV/bin/activate" ]]; then + source $VIRTUAL_ENV/bin/activate; + fi fi