diff options
Diffstat (limited to '')
35 files changed, 35 insertions, 35 deletions
diff --git a/hm/soispha/conf/git/scripts/commit.sh b/hm/soispha/conf/git/scripts/commit.sh index c0d706e2..7f6efc73 100755 --- a/hm/soispha/conf/git/scripts/commit.sh +++ b/hm/soispha/conf/git/scripts/commit.sh @@ -1,7 +1,7 @@ #!/usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH ROOT="$(git rev-parse --show-toplevel)" diff --git a/hm/soispha/conf/lf/commands/scripts/archive.sh b/hm/soispha/conf/lf/commands/scripts/archive.sh index e8f1365e..27947d6f 100755 --- a/hm/soispha/conf/lf/commands/scripts/archive.sh +++ b/hm/soispha/conf/lf/commands/scripts/archive.sh @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH # Option '-f' disables pathname expansion which can be useful when $f, $fs, and # $fx variables contain names with '*' or '?' characters. However, this option diff --git a/hm/soispha/conf/lf/commands/scripts/broot_jump.sh b/hm/soispha/conf/lf/commands/scripts/broot_jump.sh index 4afb36ac..0e4cba2f 100755 --- a/hm/soispha/conf/lf/commands/scripts/broot_jump.sh +++ b/hm/soispha/conf/lf/commands/scripts/broot_jump.sh @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH # shellcheck disable=SC2269 f="$f" diff --git a/hm/soispha/conf/lf/commands/scripts/chmod.sh b/hm/soispha/conf/lf/commands/scripts/chmod.sh index 81373352..12530cdc 100755 --- a/hm/soispha/conf/lf/commands/scripts/chmod.sh +++ b/hm/soispha/conf/lf/commands/scripts/chmod.sh @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH # shellcheck disable=SC2269 f="$f" diff --git a/hm/soispha/conf/lf/commands/scripts/clear_trash.sh b/hm/soispha/conf/lf/commands/scripts/clear_trash.sh index f2ec5c5e..1a0bdac7 100755 --- a/hm/soispha/conf/lf/commands/scripts/clear_trash.sh +++ b/hm/soispha/conf/lf/commands/scripts/clear_trash.sh @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH # could also use --force, for instand removal trash list | fzf --multi | awk '{print $NF}' | xargs trash empty --match=exact diff --git a/hm/soispha/conf/lf/commands/scripts/cow_cp.sh b/hm/soispha/conf/lf/commands/scripts/cow_cp.sh index c17b7668..3f14704b 100755 --- a/hm/soispha/conf/lf/commands/scripts/cow_cp.sh +++ b/hm/soispha/conf/lf/commands/scripts/cow_cp.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH # shellcheck disable=SC2269 f="$f" diff --git a/hm/soispha/conf/lf/commands/scripts/dl_file.sh b/hm/soispha/conf/lf/commands/scripts/dl_file.sh index 4f97f9b9..fbd0f21b 100755 --- a/hm/soispha/conf/lf/commands/scripts/dl_file.sh +++ b/hm/soispha/conf/lf/commands/scripts/dl_file.sh @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH # shellcheck disable=SC2269 f="$f" diff --git a/hm/soispha/conf/lf/commands/scripts/dragon.sh b/hm/soispha/conf/lf/commands/scripts/dragon.sh index 70633583..5a38305e 100755 --- a/hm/soispha/conf/lf/commands/scripts/dragon.sh +++ b/hm/soispha/conf/lf/commands/scripts/dragon.sh @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH # shellcheck disable=SC2269 f="$f" diff --git a/hm/soispha/conf/lf/commands/scripts/dragon_individual.sh b/hm/soispha/conf/lf/commands/scripts/dragon_individual.sh index 500be67c..be82f0f9 100755 --- a/hm/soispha/conf/lf/commands/scripts/dragon_individual.sh +++ b/hm/soispha/conf/lf/commands/scripts/dragon_individual.sh @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH # shellcheck disable=SC2269 f="$f" diff --git a/hm/soispha/conf/lf/commands/scripts/dragon_stay.sh b/hm/soispha/conf/lf/commands/scripts/dragon_stay.sh index 273482ea..dddaf4ab 100755 --- a/hm/soispha/conf/lf/commands/scripts/dragon_stay.sh +++ b/hm/soispha/conf/lf/commands/scripts/dragon_stay.sh @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH # shellcheck disable=SC2269 f="$f" diff --git a/hm/soispha/conf/lf/commands/scripts/execute.sh b/hm/soispha/conf/lf/commands/scripts/execute.sh index 15db0b70..587d1f1a 100755 --- a/hm/soispha/conf/lf/commands/scripts/execute.sh +++ b/hm/soispha/conf/lf/commands/scripts/execute.sh @@ -1,7 +1,7 @@ #!/usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH # shellcheck disable=SC2269 f="$f" diff --git a/hm/soispha/conf/lf/commands/scripts/fzf_jump.sh b/hm/soispha/conf/lf/commands/scripts/fzf_jump.sh index 6f8981f3..edfa0ab0 100755 --- a/hm/soispha/conf/lf/commands/scripts/fzf_jump.sh +++ b/hm/soispha/conf/lf/commands/scripts/fzf_jump.sh @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH res="$(fd . --maxdepth 3 | fzf --header='Jump to location')" diff --git a/hm/soispha/conf/lf/commands/scripts/go_project_root.sh b/hm/soispha/conf/lf/commands/scripts/go_project_root.sh index e1147fce..e0e27e9a 100755 --- a/hm/soispha/conf/lf/commands/scripts/go_project_root.sh +++ b/hm/soispha/conf/lf/commands/scripts/go_project_root.sh @@ -1,7 +1,7 @@ #!/usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH # shellcheck disable=SC2269 f="$f" diff --git a/hm/soispha/conf/lf/commands/scripts/mk_dir.sh b/hm/soispha/conf/lf/commands/scripts/mk_dir.sh index 6079b85d..e3dc5ee4 100755 --- a/hm/soispha/conf/lf/commands/scripts/mk_dir.sh +++ b/hm/soispha/conf/lf/commands/scripts/mk_dir.sh @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH # shellcheck disable=SC2269 f="$f" diff --git a/hm/soispha/conf/lf/commands/scripts/mk_file.sh b/hm/soispha/conf/lf/commands/scripts/mk_file.sh index 9fb0a000..2951ec94 100755 --- a/hm/soispha/conf/lf/commands/scripts/mk_file.sh +++ b/hm/soispha/conf/lf/commands/scripts/mk_file.sh @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH # shellcheck disable=SC2269 f="$f" diff --git a/hm/soispha/conf/lf/commands/scripts/mk_file_and_edit.sh b/hm/soispha/conf/lf/commands/scripts/mk_file_and_edit.sh index 2007cc99..dc9fe87e 100755 --- a/hm/soispha/conf/lf/commands/scripts/mk_file_and_edit.sh +++ b/hm/soispha/conf/lf/commands/scripts/mk_file_and_edit.sh @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH # shellcheck disable=SC2269 f="$f" diff --git a/hm/soispha/conf/lf/commands/scripts/mk_ln.sh b/hm/soispha/conf/lf/commands/scripts/mk_ln.sh index e767c848..889be037 100755 --- a/hm/soispha/conf/lf/commands/scripts/mk_ln.sh +++ b/hm/soispha/conf/lf/commands/scripts/mk_ln.sh @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH # shellcheck disable=SC2269 f="$f" diff --git a/hm/soispha/conf/lf/commands/scripts/mk_scr_default.sh b/hm/soispha/conf/lf/commands/scripts/mk_scr_default.sh index 7ca3759e..6ceed95e 100755 --- a/hm/soispha/conf/lf/commands/scripts/mk_scr_default.sh +++ b/hm/soispha/conf/lf/commands/scripts/mk_scr_default.sh @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH # shellcheck disable=SC2269 f="$f" diff --git a/hm/soispha/conf/lf/commands/scripts/mk_scr_temp.sh b/hm/soispha/conf/lf/commands/scripts/mk_scr_temp.sh index 0f8394fa..17ef76be 100755 --- a/hm/soispha/conf/lf/commands/scripts/mk_scr_temp.sh +++ b/hm/soispha/conf/lf/commands/scripts/mk_scr_temp.sh @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH # shellcheck disable=SC2269 f="$f" diff --git a/hm/soispha/conf/lf/commands/scripts/restore_trash.sh b/hm/soispha/conf/lf/commands/scripts/restore_trash.sh index 7aeed7bf..05b850d3 100755 --- a/hm/soispha/conf/lf/commands/scripts/restore_trash.sh +++ b/hm/soispha/conf/lf/commands/scripts/restore_trash.sh @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH # shellcheck disable=SC2269 f="$f" diff --git a/hm/soispha/conf/lf/commands/scripts/set_wall_paper.sh b/hm/soispha/conf/lf/commands/scripts/set_wall_paper.sh index 828c0708..57dcb931 100755 --- a/hm/soispha/conf/lf/commands/scripts/set_wall_paper.sh +++ b/hm/soispha/conf/lf/commands/scripts/set_wall_paper.sh @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH # shellcheck disable=SC2269 f="$f" diff --git a/hm/soispha/conf/lf/commands/scripts/stripspace.sh b/hm/soispha/conf/lf/commands/scripts/stripspace.sh index 65eefbcd..37d8126c 100755 --- a/hm/soispha/conf/lf/commands/scripts/stripspace.sh +++ b/hm/soispha/conf/lf/commands/scripts/stripspace.sh @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH # shellcheck disable=SC2269 f="$f" diff --git a/hm/soispha/conf/lf/commands/scripts/trash.sh b/hm/soispha/conf/lf/commands/scripts/trash.sh index c605420e..deea608a 100755 --- a/hm/soispha/conf/lf/commands/scripts/trash.sh +++ b/hm/soispha/conf/lf/commands/scripts/trash.sh @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH # shellcheck disable=SC2269 f="$f" diff --git a/hm/soispha/conf/lf/commands/scripts/unarchive.sh b/hm/soispha/conf/lf/commands/scripts/unarchive.sh index 7a1377fa..25e17a82 100755 --- a/hm/soispha/conf/lf/commands/scripts/unarchive.sh +++ b/hm/soispha/conf/lf/commands/scripts/unarchive.sh @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH # shellcheck disable=SC2269 f="$f" diff --git a/hm/soispha/conf/lf/commands/scripts/view_file.sh b/hm/soispha/conf/lf/commands/scripts/view_file.sh index a7d7055d..2a82e52f 100755 --- a/hm/soispha/conf/lf/commands/scripts/view_file.sh +++ b/hm/soispha/conf/lf/commands/scripts/view_file.sh @@ -1,7 +1,7 @@ #!/usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH # shellcheck disable=SC2269 f="$f" diff --git a/hm/soispha/conf/taskwarrior/hooks/scripts/on-add_enforce-policies.sh b/hm/soispha/conf/taskwarrior/hooks/scripts/on-add_enforce-policies.sh index 6f09a7e6..3b87a204 100755 --- a/hm/soispha/conf/taskwarrior/hooks/scripts/on-add_enforce-policies.sh +++ b/hm/soispha/conf/taskwarrior/hooks/scripts/on-add_enforce-policies.sh @@ -1,7 +1,7 @@ #!/usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH # override shell lib output to stdout eprint() { diff --git a/hm/soispha/conf/taskwarrior/hooks/scripts/on-add_sync-git-repo.sh b/hm/soispha/conf/taskwarrior/hooks/scripts/on-add_sync-git-repo.sh index 085115e7..e21e3c4b 100755 --- a/hm/soispha/conf/taskwarrior/hooks/scripts/on-add_sync-git-repo.sh +++ b/hm/soispha/conf/taskwarrior/hooks/scripts/on-add_sync-git-repo.sh @@ -1,7 +1,7 @@ #!/usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH # override shell lib output to stdout eprint() { diff --git a/hm/soispha/conf/taskwarrior/hooks/scripts/on-modify_sync-git-repo.sh b/hm/soispha/conf/taskwarrior/hooks/scripts/on-modify_sync-git-repo.sh index 996e105a..1200a1bf 100755 --- a/hm/soispha/conf/taskwarrior/hooks/scripts/on-modify_sync-git-repo.sh +++ b/hm/soispha/conf/taskwarrior/hooks/scripts/on-modify_sync-git-repo.sh @@ -1,7 +1,7 @@ #!/usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH # override shell lib output to stdout eprint() { diff --git a/hm/soispha/conf/xdg/url_handler.sh b/hm/soispha/conf/xdg/url_handler.sh index 53ae4986..ae783ad0 100755 --- a/hm/soispha/conf/xdg/url_handler.sh +++ b/hm/soispha/conf/xdg/url_handler.sh @@ -1,7 +1,7 @@ #!/usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH project="$(echo "%ALL_PROJECTS_PIPE|nvim|zathura|" | rofi -sep "|" -dmenu)" diff --git a/hm/soispha/conf/yambar/scripts/disk.sh b/hm/soispha/conf/yambar/scripts/disk.sh index 284661b9..3cae64c7 100755 --- a/hm/soispha/conf/yambar/scripts/disk.sh +++ b/hm/soispha/conf/yambar/scripts/disk.sh @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH # Main loop while true; do diff --git a/hm/soispha/conf/yambar/scripts/mpd_song_name.sh b/hm/soispha/conf/yambar/scripts/mpd_song_name.sh index b251619b..1c8e4e8d 100755 --- a/hm/soispha/conf/yambar/scripts/mpd_song_name.sh +++ b/hm/soispha/conf/yambar/scripts/mpd_song_name.sh @@ -1,7 +1,7 @@ #!/usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH while true; do state="$(mpc status '%state%')" diff --git a/hm/soispha/conf/yambar/scripts/network.sh b/hm/soispha/conf/yambar/scripts/network.sh index b4396640..26177d53 100755 --- a/hm/soispha/conf/yambar/scripts/network.sh +++ b/hm/soispha/conf/yambar/scripts/network.sh @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH retest=120 retest_if_con_fails=10 diff --git a/hm/soispha/conf/yambar/scripts/sound-volume.sh b/hm/soispha/conf/yambar/scripts/sound-volume.sh index f887b4de..325b793f 100755 --- a/hm/soispha/conf/yambar/scripts/sound-volume.sh +++ b/hm/soispha/conf/yambar/scripts/sound-volume.sh @@ -1,7 +1,7 @@ #! /usr/bin/env dash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH while true; do volume="$(pactl get-sink-volume 0 | awk 'BEGIN { FS="/" } {gsub("%","",$2); gsub(" ","",$2)} {printf $2}')" diff --git a/hm/soispha/conf/zsh/default.nix b/hm/soispha/conf/zsh/default.nix index f7493e5e..faff46c9 100644 --- a/hm/soispha/conf/zsh/default.nix +++ b/hm/soispha/conf/zsh/default.nix @@ -71,7 +71,7 @@ + builtins.readFile ./config/command_not_found_insult.sh + builtins.readFile ./config/custom_cursor.zsh + builtins.readFile "${pkgs.fzf}/share/fzf/key-bindings.zsh" - + ''SHELL_LIBRARY_VERSION="2.0.13" source ${shell_library.rawLib.${system}}''; + + ''SHELL_LIBRARY_VERSION="2.1.1" source ${shell_library.rawLib.${system}}''; shellAliases = { ll = ". ll"; diff --git a/hm/soispha/wms/river/init.sh b/hm/soispha/wms/river/init.sh index 9ec48d41..69553878 100755 --- a/hm/soispha/wms/river/init.sh +++ b/hm/soispha/wms/river/init.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH +SHELL_LIBRARY_VERSION="2.1.1" . %SHELL_LIBRARY_PATH err_fail() { if ! "$@"; then |