Skip to content

Commit

Permalink
z.lua proper path on fish
Browse files Browse the repository at this point in the history
  • Loading branch information
hanoii committed Apr 9, 2024
1 parent 940202a commit ba35062
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 9 deletions.
3 changes: 1 addition & 2 deletions .ddev/addon-metadata/pimp-my-shell/manifest.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: pimp-my-shell
repository: .
version: ""
install_date: "2024-04-06T19:16:47-03:00"
install_date: "2024-04-09T17:47:01-03:00"
project_files:
- web-build/Dockerfile.pimp-my-shell
- homeadditions/.bashrc.d/pimp-my-shell.sh
Expand All @@ -13,7 +13,6 @@ project_files:
- homeadditions/.local/share/fish/vendor_completions.d/ahoy.fish
- homeadditions/.config/starship.toml
- homeadditions/.config/fish/conf.d/pimp-my-shell.fish
- homeadditions/.config/fish/conf.d/z.fish
- pimp-my-shell/hooks/README.md
- pimp-my-shell/hooks/post-import-db.sh
- pimp-my-shell/hooks/post-import-db.d
Expand Down
6 changes: 6 additions & 0 deletions .ddev/homeadditions/.config/fish/conf.d/pimp-my-shell.fish
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
#ddev-generated

# z.lua
mkdir -p /mnt/ddev-global-cache/z.lua/$HOSTNAME
set -x _ZL_DATA /mnt/ddev-global-cache/z.lua/$HOSTNAME/.zlua
lua /opt/z.lua/z.lua --init fish | source

function fish_title
echo "$DDEV_PROJECT ddev@"(fish_prompt_pwd_dir_length=1 prompt_pwd) - $argv
end
3 changes: 0 additions & 3 deletions .ddev/homeadditions/.config/fish/conf.d/z.fish

This file was deleted.

6 changes: 6 additions & 0 deletions homeadditions/.config/fish/conf.d/pimp-my-shell.fish
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
#ddev-generated

# z.lua
mkdir -p /mnt/ddev-global-cache/z.lua/$HOSTNAME
set -x _ZL_DATA /mnt/ddev-global-cache/z.lua/$HOSTNAME/.zlua
lua /opt/z.lua/z.lua --init fish | source

function fish_title
echo "$DDEV_PROJECT ddev@"(fish_prompt_pwd_dir_length=1 prompt_pwd) - $argv
end
3 changes: 0 additions & 3 deletions homeadditions/.config/fish/conf.d/z.fish

This file was deleted.

12 changes: 11 additions & 1 deletion install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,18 @@ project_files:
- homeadditions/.local/share/fish/vendor_completions.d/ahoy.fish
- homeadditions/.config/starship.toml
- homeadditions/.config/fish/conf.d/pimp-my-shell.fish
- homeadditions/.config/fish/conf.d/z.fish
- pimp-my-shell/hooks/README.md
- pimp-my-shell/hooks/post-import-db.sh
- pimp-my-shell/hooks/post-import-db.d
- pimp-my-shell/scripts/drush-uli.sh
post_install_actions:
- |
#ddev-description: Remove deprecated z.fish file
remove_file="homeadditions/.config/fish/conf.d/z.fish"
if [ -f "$remove_file" ]; then
if grep '#ddev-generated' "$remove_file"; then
rm "$remove_file"
else
echo "Existing "$remove_file" does not have #ddev-generated, so can't be removed"
fi
fi

0 comments on commit ba35062

Please sign in to comment.