diff --git a/home/dot_config/shell/exports.sh.tmpl b/home/dot_config/shell/exports.sh.tmpl index 398d0938..f12d5c58 100644 --- a/home/dot_config/shell/exports.sh.tmpl +++ b/home/dot_config/shell/exports.sh.tmpl @@ -48,7 +48,7 @@ export PATH="$HOME/.local/bin/cask:$PATH" export PATH="$HOME/.local/bin/docker:$PATH" export PATH="$HOME/.local/bin/firejail:$PATH" export PATH="$HOME/.local/bin/flatpak:$PATH" -export SSH_KEY_PATH="~/.ssh/id_rsa" +export SSH_KEY_PATH="$HOME/.ssh/id_rsa" ### Homebrew export HOMEBREW_NO_ENV_HINTS=true @@ -71,11 +71,11 @@ fi export WHALEBREW_INSTALL_PATH="/usr/local/bin" ### Android Studio -if [ -d ~/Library/Android ]; then - export PATH="$PATH:~/Library/Android/sdk/cmdline-tools/latest/bin" - export PATH="$PATH:~/Library/Android/sdk/platform-tools" - export PATH="$PATH:~/Library/Android/sdk/tools/bin" - export PATH="$PATH:~/Library/Android/sdk/tools" +if [ -d "$HOME/Library/Android" ]; then + export PATH="$PATH:$HOME/Library/Android/sdk/cmdline-tools/latest/bin" + export PATH="$PATH:$HOME/Library/Android/sdk/platform-tools" + export PATH="$PATH:$HOME/Library/Android/sdk/tools/bin" + export PATH="$PATH:$HOME/Library/Android/sdk/tools" fi {{ end }} export ANDROID_SDK_HOME="$XDG_DATA_HOME/android-sdk" diff --git a/home/dot_config/task/Taskfile.yml b/home/dot_config/task/Taskfile.yml index fbb33908..4bc6303f 100644 --- a/home/dot_config/task/Taskfile.yml +++ b/home/dot_config/task/Taskfile.yml @@ -394,6 +394,7 @@ tasks: if [[ "$PLIST" == *".plist" ]]; then PLIST_FILE="$(basename "$PLIST")" cp -f "$HOME/Library/Preferences/$PLIST_FILE" "/usr/local/src/install.doctor/home/Library/Preferences/$PLIST_FILE" + plutil -convert xml1 "/usr/local/src/install.doctor/home/Library/Preferences/$PLIST_FILE" fi done