vte.sh: Use the vte-urlencode utility

Drop the __vte_urlencode function and use the vte-urlencode-cwd utility,
instead of it, in __vte_osc7.

Also call __vte_osc7 directly in __vte_prompt_command, instead of in a
subshell, avoiding an extra fork.

Drop the __vte_urlencode test, since the function does not exist anymore
and vte-urlencode-cwd has its own test.

https://gitlab.gnome.org/GNOME/vte/issues/206

3 files changed, 11 insertions, 120 deletions

diff --git a/src/meson.build b/src/meson.build
index 85312ab0..78dba0c5 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -508,11 +508,6 @@ foreach test: test_units
   )
 endforeach
 
-test_script_env = test_env + [
-  # srcdir is needed for the vte.sh test
-  'srcdir=@0@'.format(meson.current_source_dir()),
-]
-
 test_scripts = [
   ['doc syntax', 'check-doc-syntax.sh'],
 ]
@@ -521,24 +516,6 @@ foreach test: test_scripts
   test(
     test[0],
     files(test[1]),
-    env: test_script_env,
-  )
-endforeach
-
-test_scripts_interactive = [
-  ['vte.sh', 'test-vte-sh.sh', files('vte.sh')],
-]
-
-# vte.sh needs to be run in an interactive shell, but there is way to
-# specify that in test(), except by running bash itself explicitly with -i.
-bash = find_program('bash')
-
-foreach test: test_scripts_interactive
-  test(
-    test[0],
-    bash,
-    args: ['-i', files(test[1]), test[2]],
-    env: test_script_env,
   )
 endforeach
 
@@ -556,8 +533,13 @@ endforeach
 
 # Shell integration
 
-install_data(
-  'vte.sh',
+vte_sh = configure_file(
+  input: 'vte.sh.in',
+  output: '@BASENAME@',
+  configuration: {
+    'libexecdir': vte_prefix / vte_libexecdir,
+  },
+  install: true,
   install_dir: vte_sysconfdir / 'profile.d',
 )
 
diff --git a/src/test-vte-sh.sh b/src/test-vte-sh.sh
deleted file mode 100755
index 331a38c1..00000000
--- a/src/test-vte-sh.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright © 2013 Christian Persch
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-set -e
-
-export VTE_VERSION=9999
-
-source "$1" || exit 126
-
-check_urlencode() (
-  set -e
-  input=$(echo -ne "$1")
-  encoded=$(__vte_urlencode "$input")
-  if test "$encoded" != "$2"; then
-    echo "FAILED:"
-    echo "Input   : \"$input\""
-    echo "Output  : \"$encoded\""
-    echo "Expected: \"$2\""
-  fi
-)
-
-# raw bytes
-
-check_urlencode "\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017" \
-                "%01%02%03%04%05%06%07%08%09%0A%0B%0C%0D%0E%0F"
-check_urlencode "\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" \
-                "%10%11%12%13%14%15%16%17%18%19%1A%1B%1C%1D%1E%1F"
-check_urlencode "\040\041\042\043\044\045\046\047\050\051\052\053\054\055\056\057" \
-                "%20!%22%23%24%25%26'()%2A%2B%2C-./"
-check_urlencode "\060\061\062\063\064\065\066\067\070\071\072\073\074\075\076\077" \
-                "0123456789:%3B%3C%3D%3E%3F"
-check_urlencode "\0100\0101\0102\0103\0104\0105\0106\0107\0110\0111\0112\0113\0114\0115\0116\0117" \
-                "%40ABCDEFGHIJKLMNO"
-check_urlencode "\0120\0121\0122\0123\0124\0125\0126\0127\0130\0131\0132\0133\0134\0135\0136\0137" \
-                "PQRSTUVWXYZ%5B%5C%5D%5E_"
-check_urlencode "\0140\0141\0142\0143\0144\0145\0146\0147\0150\0151\0152\0153\0154\0155\0156\0157" \
-                "%60abcdefghijklmno"
-check_urlencode "\0160\0161\0162\0163\0164\0165\0166\0167\0170\0171\0172\0173\0174\0175\0176\0177" \
-                "pqrstuvwxyz%7B%7C%7D~%7F"
-check_urlencode "\0200\0201\0202\0203\0204\0205\0206\0207\0210\0211\0212\0213\0214\0215\0216\0217" \
-                "%80%81%82%83%84%85%86%87%88%89%8A%8B%8C%8D%8E%8F"
-check_urlencode "\0220\0221\0222\0223\0224\0225\0226\0227\0230\0231\0232\0233\0234\0235\0236\0237" \
-                "%90%91%92%93%94%95%96%97%98%99%9A%9B%9C%9D%9E%9F"
-check_urlencode "\0240\0241\0242\0243\0244\0245\0246\0247\0250\0251\0252\0253\0254\0255\0256\0257" \
-                "%A0%A1%A2%A3%A4%A5%A6%A7%A8%A9%AA%AB%AC%AD%AE%AF"
-check_urlencode "\0260\0261\0262\0263\0264\0265\0266\0267\0270\0271\0272\0273\0274\0275\0276\0277" \
-                "%B0%B1%B2%B3%B4%B5%B6%B7%B8%B9%BA%BB%BC%BD%BE%BF"
-check_urlencode "\0300\0301\0302\0303\0304\0305\0306\0307\0310\0311\0312\0313\0314\0315\0316\0317" \
-                "%C0%C1%C2%C3%C4%C5%C6%C7%C8%C9%CA%CB%CC%CD%CE%CF"
-check_urlencode "\0320\0321\0322\0323\0324\0325\0326\0327\0330\0331\0332\0333\0334\0335\0336\0337" \
-                "%D0%D1%D2%D3%D4%D5%D6%D7%D8%D9%DA%DB%DC%DD%DE%DF"
-check_urlencode "\0340\0341\0342\0343\0344\0345\0346\0347\0350\0351\0352\0353\0354\0355\0356\0357" \
-                "%E0%E1%E2%E3%E4%E5%E6%E7%E8%E9%EA%EB%EC%ED%EE%EF"
-check_urlencode "\0360\0361\0362\0363\0364\0365\0366\0367\0370\0371\0372\0373\0374\0375\0376\0377" \
-                "%F0%F1%F2%F3%F4%F5%F6%F7%F8%F9%FA%FB%FC%FD%FE%FF"
-
-# UTF-8
-
-check_urlencode "ẞ" "%E1%BA%9E"
-
-# all tests pass!
-exit 0
diff --git a/src/vte.sh b/src/vte.sh.in
index aff85f82..8b3153da 100644
--- a/src/vte.sh
+++ b/src/vte.sh.in
@@ -1,5 +1,4 @@
-# Copyright © 2006 Shaun McCance <shaunm@gnome.org>
-# Copyright © 2013 Peter De Wachter <pdewacht@gmail.com>
+# Copyright © 2012 Christian Persch
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,31 +22,16 @@
 # Not running under vte?
 [ "${VTE_VERSION:-0}" -ge 3405 ] || return 0
 
-__vte_urlencode() (
-  # This is important to make sure string manipulation is handled
-  # byte-by-byte.
-  LC_ALL=C
-  str="$1"
-  while [ -n "$str" ]; do
-    safe="${str%%[!a-zA-Z0-9/:_\.\-\!\'\(\)~]*}"
-    printf "%s" "$safe"
-    str="${str#"$safe"}"
-    if [ -n "$str" ]; then
-      printf "%%%02X" "'$str"
-      str="${str#?}"
-    fi
-  done
-)
-
 __vte_osc7 () {
-  printf "\033]7;file://%s%s\033\\" "${HOSTNAME:-}" "$(__vte_urlencode "${PWD}")"
+  printf "\033]7;file://%s%s\033\\" "${HOSTNAME}" "$(@libexecdir@/vte-urlencode-cwd)"
 }
 
 __vte_prompt_command() {
   local pwd='~'
   [ "$PWD" != "$HOME" ] && pwd=${PWD/#$HOME\//\~\/}
   pwd="${pwd//[[:cntrl:]]}"
-  printf "\033]0;%s@%s:%s\033\\%s" "${USER}" "${HOSTNAME%%.*}" "${pwd}" "$(__vte_osc7)"
+  printf "\033]0;%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${pwd}"
+  __vte_osc7
 }
 
 case "$TERM" in