From 35abdddc511adcff386a4ef180332df0e1b0b9fd Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Wed, 15 May 2024 09:14:28 +0700 Subject: [PATCH] refactor(zsh): Add `ZI_` to avoid potential conflict --- .config/zsh/.zshenv | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv index 8811dac..0724180 100644 --- a/.config/zsh/.zshenv +++ b/.config/zsh/.zshenv @@ -4,8 +4,8 @@ export XDG_CACHE_HOME="$HOME/.cache" export XDG_DATA_HOME="$HOME/.local/share" export XDG_STATE_HOME="$HOME/.local/state" export XDG_CONFIG_HOME="$HOME/.config" -export BINARY_HOME="$HOME/.local/bin" -export SCRIPTS_HOME="$HOME/.local/bin/scripts" +export ZI_BINARY_HOME="$HOME/.local/bin" +export ZI_SCRIPTS_HOME="$ZI_BINARY_HOME/scripts" if [[ "$OSTYPE" == "darwin"* ]]; then export JAVA_HOME="$HOME/.sdkman/candidates/java/current" @@ -34,12 +34,12 @@ fi export BUN_INSTALL="$HOME/.bun" if [[ "$OSTYPE" == "darwin"* ]]; then export PYTHONPATH="$HOME/Library/Python/3.10/lib:$PYTHONPATH" - LOCAL_PATH=$(du "$BINARY_HOME" -d 1 | cut -f2 > /tmp/ENV_PATH && paste -sd ':' /tmp/ENV_PATH) + LOCAL_PATH=$(du "$ZI_BINARY_HOME" -d 1 | cut -f2 > /tmp/ENV_PATH && paste -sd ':' /tmp/ENV_PATH) LOCAL_PATH="$HOME/Library/Python/3.10/bin:$LOCAL_PATH" elif [[ "$OSTYPE" == "linux-gnu" ]]; then - LOCAL_PATH=$(du "$BINARY_HOME" -d 1 | cut -f2 | paste -sd ':') + LOCAL_PATH=$(du "$ZI_BINARY_HOME" -d 1 | cut -f2 | paste -sd ':') fi -PATH="$BUN_INSTALL/bin:$HOME/.pub-cache/bin:$HOME/.local/share/go/bin:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_AVD_HOME:$HOME/.local/share/npm/bin:$HOME/.local/share/cargo/bin:$SCRIPTS_HOME/bin:$LOCAL_PATH${PATH:+:${PATH}}" +PATH="$BUN_INSTALL/bin:$HOME/.pub-cache/bin:$HOME/.local/share/go/bin:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_AVD_HOME:$HOME/.local/share/npm/bin:$HOME/.local/share/cargo/bin:$ZI_SCRIPTS_HOME/bin:$LOCAL_PATH${PATH:+:${PATH}}" # export RUST_SRC_PATH=$(rustc --print sysroot)/lib/rustlib/src/rust/library # -- IBus stuff (IME)