[arch-commits] Commit in languagetool/trunk (PKGBUILD languagetool.sh)

[Andrzej Giniewicz]

    Date: Friday, February 7, 2014 @ 13:35:45
  Author: aginiewicz
Revision: 105426

upgpkg: languagetool 2.4.1-2

languagetool: enable http server, FS#38773

Modified:
  languagetool/trunk/PKGBUILD
  languagetool/trunk/languagetool.sh

-----------------+
 PKGBUILD        |    4 ++--
 languagetool.sh |   32 ++++++++++++++++++++++++++------
 2 files changed, 28 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-07 11:53:10 UTC (rev 105425)
+++ PKGBUILD	2014-02-07 12:35:45 UTC (rev 105426)
@@ -5,7 +5,7 @@
 
 pkgname=languagetool
 pkgver=2.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An open source language checker"
 arch=('any')
 url="http://www.languagetool.org" 
@@ -18,7 +18,7 @@
 source=($pkgname-$pkgver.zip::"http://www.languagetool.org/download/LanguageTool-stable.zip?$pkgver" "$pkgname.sh")
 noextract=($pkgname-$pkgver.zip)
 md5sums=('53265e24496707225a2f5997e65634a3'
-         '9d3c008ad6c0e150a29ea0be8e32a7fe')
+         '81c8355c6b3820e9788199daa647089e')
 
 package() {
   cd "$srcdir"

Modified: languagetool.sh
===================================================================
--- languagetool.sh	2014-02-07 11:53:10 UTC (rev 105425)
+++ languagetool.sh	2014-02-07 12:35:45 UTC (rev 105426)
@@ -3,7 +3,11 @@
 file_present=false
 asked_for_help=false
 start_server=false
+https_server=false
 
+declare -a argv=("$@")
+
+i=0
 for arg in "$@"; do
   if [[ $arg != -* ]]; then
     file_present=true
@@ -10,13 +14,21 @@
   fi
   if [[ $arg == --config* ]]; then
     start_server=true
+    https_server=true
   fi
+  if [[ $arg == --http ]]; then
+    start_server=true
+    unset argv[$i]
+  fi
   if [[ $arg == -h ]]; then
     asked_for_help=true
+    unset argv[$i]
   fi
   if [[ $arg == --help ]]; then
     asked_for_help=true
+    unset argv[$i]
   fi
+  ((i++))
 done
 
 CP=/usr/share/languagetool
@@ -26,25 +38,33 @@
 
 CLI_command='org.languagetool.commandline.Main'
 GUI_command='org.languagetool.gui.Main'
-SRV_command='org.languagetool.server.HTTPSServer'
+NSRV_command='org.languagetool.server.HTTPServer'
+SSRV_command='org.languagetool.server.HTTPSServer'
 
 if $asked_for_help; then
   echo "Command-line interface (CLI) help:"
-  "$JAVA_HOME/bin/java" -cp $CP $CLI_command -h | sed "s/java -jar LanguageTool.jar/languagetool/"
+  "$JAVA_HOME/bin/java" -cp $CP $CLI_command -h | sed "s/java -jar languagetool-commandline.jar/languagetool/"
   echo
   echo "Graphical user interface (GUI) help:"
   "$JAVA_HOME/bin/java" -cp $CP $GUI_command -h | sed "s/java org.languagetool.gui.Main/languagetool/"
   echo
+  echo "HTTP server help:"
+  "$JAVA_HOME/bin/java" -cp $CP $NSRV_command -h | sed "s/HTTPServer/languagetool --http/"
+  echo
   echo "HTTPS server help:"
-  "$JAVA_HOME/bin/java" -cp $CP $SRV_command -h | sed "s/HTTPSServer/languagetool/"
+  "$JAVA_HOME/bin/java" -cp $CP $SSRV_command -h | sed "s/HTTPSServer/languagetool/"
 else
   if $start_server; then
-    "$JAVA_HOME/bin/java" -cp $CP $SRV_command "$@"
+    if $https_server; then
+      "$JAVA_HOME/bin/java" -cp $CP $SSRV_command "${argv[@]}"
+    else
+      "$JAVA_HOME/bin/java" -cp $CP $NSRV_command "${argv[@]}"
+    fi
   else
     if $file_present; then
-      "$JAVA_HOME/bin/java" -cp $CP $CLI_command "$@"
+      "$JAVA_HOME/bin/java" -cp $CP $CLI_command "${argv[@]}"
     else
-      "$JAVA_HOME/bin/java" -cp $CP $GUI_command "$@"
+      "$JAVA_HOME/bin/java" -cp $CP $GUI_command "${argv[@]}"
     fi
   fi
 fi