From cba1a72412c8223aed94732e75289e5a57dd2e96 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Sun, 7 Oct 2012 06:18:13 +0900 Subject: portability: use "=" operator instead of "==" in shell scripts "==" operator is only available in bash but not in the SUSv3 or POSIX shell specification. This causes a problem with Debian's dash. https://bugzilla.gnome.org/show_bug.cgi?id=685629 --- bin/antler-keyboard.in | 2 +- bin/caribou-preferences.in | 2 +- bin/caribou.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/antler-keyboard.in b/bin/antler-keyboard.in index 3c0b13d..b25956e 100755 --- a/bin/antler-keyboard.in +++ b/bin/antler-keyboard.in @@ -23,7 +23,7 @@ script_dir="$(dirname "$(readlink -f ${0})")" prefix=@prefix@ exec_prefix=@exec_prefix@ -if [ $script_dir == "@libexecdir@" ] +if [ $script_dir = "@libexecdir@" ] then datadir="$(@PYTHON@ -c "from gi.repository import GLib; print ':'.join(GLib.get_system_data_dirs())")" export PYTHONPATH="${prefix}/lib/python@PYTHON_VERSION@/site-packages:${prefix}/lib64/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}" diff --git a/bin/caribou-preferences.in b/bin/caribou-preferences.in index 636ef89..49650ff 100755 --- a/bin/caribou-preferences.in +++ b/bin/caribou-preferences.in @@ -23,7 +23,7 @@ script_dir="$(dirname "$(readlink -f ${0})")" prefix=@prefix@ exec_prefix=@exec_prefix@ -if [ $script_dir == "@bindir@" ] +if [ $script_dir = "@bindir@" ] then datadir="$(@PYTHON@ -c "from gi.repository import GLib; print ':'.join(GLib.get_system_data_dirs())")" export PYTHONPATH="@prefix@/lib/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}" diff --git a/bin/caribou.in b/bin/caribou.in index 29ba6b0..f2cdc2f 100755 --- a/bin/caribou.in +++ b/bin/caribou.in @@ -29,7 +29,7 @@ script_dir="$(dirname "$(readlink -f ${0})")" prefix=@prefix@ exec_prefix=@exec_prefix@ -if [ $script_dir == "@bindir@" ] +if [ $script_dir = "@bindir@" ] then export PYTHONPATH="@prefix@/lib/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}" export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" -- cgit v1.2.1