Skip to content

Commit 58797f3

Browse files
committed
πŸ› Move global.sh to config instead of data
1 parent f10c8fb commit 58797f3

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

β€Žlib/function/setup_default_shell.shβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ laptop_setup_default_shell() {
2222
laptop_file_ensure_template "$profile_dir/resource/.zshrc.local" "$HOME/.zshrc.local"
2323
# Legacy migration
2424
laptop_file_moved "$(laptop_xdg_dir "data")/zsh/personal.sh" "$(laptop_xdg_dir "config")/zsh/init"
25+
laptop_file_moved "$(laptop_xdg_dir "data")/zsh/init.d/global.sh" "$(laptop_xdg_dir "config")/zsh/init.d/global.sh"
2526
laptop_file_moved "$(laptop_xdg_dir "data")/zsh/global.sh" "$(laptop_xdg_dir "config")/zsh/init.d/global.sh"
2627

2728
# Configure ZSH

β€Žprofile/default/bootstrap-shell.zshβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ LAPTOP_PROFILE_DEFAULT_DIR=$(laptop_profile_dir default)
99
# Ensure ZSH Configuration
1010
laptop_file_ensure_template "$LAPTOP_PROFILE_DEFAULT_DIR/resource/starship.toml" "${STARSHIP_CONFIG:-$(laptop_xdg_dir "config")/starship/config.toml}"
1111
laptop_file_ensure_template "$LAPTOP_PROFILE_DEFAULT_DIR/resource/.config/zsh/init" "$(laptop_xdg_dir "config")/zsh/init"
12-
laptop_file_ensure_template "$LAPTOP_PROFILE_DEFAULT_DIR/resource/.config/zsh/init.d/global.sh" "$(laptop_xdg_dir "data")/zsh/init.d/global.sh" --force
12+
laptop_file_ensure_template "$LAPTOP_PROFILE_DEFAULT_DIR/resource/.config/zsh/init.d/global.sh" "$(laptop_xdg_dir "config")/zsh/init.d/global.sh" --force
1313
laptop_file_ensure_template "$LAPTOP_PROFILE_DEFAULT_DIR/resource/.config/zsh/profile" "$(laptop_xdg_dir "config")/zsh/profile"
1414

0 commit comments

Comments
Β (0)