Merge branch 'bash-completion' of gitlab.com:bluca/openconnect

sailfishos-mirror · May 4, 2020 · df7eb56 · df7eb56
2 parents 1cfda76 + 2522d50
commit df7eb56
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -140,10 +140,10 @@ EXTRA_DIST += $(shell cd "$(top_srcdir)" && \
 DISTCLEANFILES = $(pkgconfig_DATA)
 
 pkglibexec_SCRIPTS = trojans/csd-post.sh trojans/csd-wrapper.sh trojans/tncc-wrapper.py \
-	trojans/hipreport.sh trojans/hipreport-android.sh
+	trojans/hipreport.sh trojans/hipreport-android.sh trojans/tncc-emulate.py
 
-bashcompletiondir = $(sysconfdir)/bash_completion.d
-bashcompletion_DATA = bash/openconnect.bash
+bashcompletiondir = $(datadir)/bash-completion/completions
+bashcompletion_DATA = bash/openconnect
 
 # main.c includes version.c
 openconnect-main.$(OBJEXT): version.c

diff --git a/bash/openconnect.bash → bash/openconnect b/bash/openconnect.bash → bash/openconnect
diff --git a/tests/autocompletion b/tests/autocompletion
@@ -25,7 +25,7 @@
 OPENCONNECT="${OPENCONNECT:-${top_builddir}/openconnect}"
 
 if ! [ -x $OPENCONNECT ]; then
-    echo "$OPENCONNECT is not exeuctable. Are you cross-compiling for Windows?"
+    echo "$OPENCONNECT is not executable. Are you cross-compiling for Windows?"
     exit 77
 fi
 

diff --git a/www/changelog.xml b/www/changelog.xml
@@ -15,7 +15,7 @@
 <ul>
    <li><b>OpenConnect HEAD</b>
      <ul>
-       <li><i>No changelog entries yet</i></li>
+       <li>Install bash completion script as /usr/share/bash-completion/completions/openconnect.</li>
      </ul><br/>
   </li>
   <li><b><a href="ftp://ftp.infradead.org/pub/openconnect/openconnect-8.09.tar.gz">OpenConnect v8.09</a></b>