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

2014-07-01 Thread Andrzej Giniewicz
Date: Tuesday, July 1, 2014 @ 10:03:54
  Author: aginiewicz
Revision: 113888

upgpkg: languagetool 2.6-1

Update to languagetool 2.6

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

-+
 PKGBUILD|6 +++---
 languagetool.sh |   10 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-07-01 08:03:15 UTC (rev 113887)
+++ PKGBUILD2014-07-01 08:03:54 UTC (rev 113888)
@@ -4,7 +4,7 @@
 # Contributor: Panagiotis Papadopoulos pano_90 (AT) gmx (DOT) net
 
 pkgname=languagetool
-pkgver=2.5
+pkgver=2.6
 pkgrel=1
 pkgdesc=An open source language checker
 arch=('any')
@@ -17,8 +17,8 @@
 'gtk2: needed for the GUI version')
 
source=($pkgname-$pkgver.zip::http://www.languagetool.org/download/LanguageTool-stable.zip?$pkgver;
 $pkgname.sh)
 noextract=($pkgname-$pkgver.zip)
-md5sums=('34b23e7bea0064b6e347aa169537d3d6'
- '81c8355c6b3820e9788199daa647089e')
+md5sums=('fff49dfd61e00fbd7c07d692b2a64065'
+ '136387ef7979e23004330d553736a89b')
 
 package() {
   cd $srcdir

Modified: languagetool.sh
===
--- languagetool.sh 2014-07-01 08:03:15 UTC (rev 113887)
+++ languagetool.sh 2014-07-01 08:03:54 UTC (rev 113888)
@@ -3,7 +3,7 @@
 file_present=false
 asked_for_help=false
 start_server=false
-https_server=false
+http_server=false
 
 declare -a argv=($@)
 
@@ -14,10 +14,10 @@
   fi
   if [[ $arg == --config* ]]; then
 start_server=true
-https_server=true
   fi
   if [[ $arg == --http ]]; then
 start_server=true
+http_server=true
 unset argv[$i]
   fi
   if [[ $arg == -h ]]; then
@@ -55,10 +55,10 @@
   $JAVA_HOME/bin/java -cp $CP $SSRV_command -h | sed 
s/HTTPSServer/languagetool/
 else
   if $start_server; then
-if $https_server; then
+if $http_server; then
+  $JAVA_HOME/bin/java -cp $CP $NSRV_command ${argv[@]}
+else
   $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



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

2014-02-07 Thread 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
===
--- PKGBUILD2014-02-07 11:53:10 UTC (rev 105425)
+++ PKGBUILD2014-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



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

2013-04-02 Thread Andrzej Giniewicz
Date: Tuesday, April 2, 2013 @ 20:01:39
  Author: aginiewicz
Revision: 87534

upgpkg: languagetool 2.1-1

update to languagetool 2.1, added server to script

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

-+
 PKGBUILD|   26 --
 languagetool.sh |   21 +
 2 files changed, 29 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-02 17:43:50 UTC (rev 87533)
+++ PKGBUILD2013-04-02 18:01:39 UTC (rev 87534)
@@ -4,7 +4,7 @@
 # Contributor: Panagiotis Papadopoulos pano_90 (AT) gmx (DOT) net
 
 pkgname=languagetool
-pkgver=2.0
+pkgver=2.1
 pkgrel=1
 pkgdesc=An open source language checker
 arch=('any')
@@ -12,27 +12,25 @@
 license=(LGPL)
 depends=('java-runtime-headless=6')
 makedepends=('unzip')
-optdepends=('hunspell: needed for spell checking of some languages'
-'java-runtime: needed for the GUI version'
+optdepends=('java-runtime: needed for the GUI version'
 'libxtst: needed for the GUI version'
 'gtk2: needed for the GUI version')
-install=languagetool.install
-source=(http://www.languagetool.org/download/LanguageTool-stable.zip?$pkgver 
languagetool.sh)
-noextract=(LanguageTool-stable.zip?$pkgver)
-md5sums=('ca4d318fd07472e1ca46a3817dac5b74'
- '17a63e5abaf8a0ed201137bc9569895e')
+install=$pkgname.install
+source=($pkgname-$pkgver.zip::http://www.languagetool.org/download/LanguageTool-stable.zip?$pkgver;
 $pkgname.sh)
+noextract=($pkgname-$pkgver.zip)
+md5sums=('b8a04d5f62803691b8e26882401753f7'
+ '9d3c008ad6c0e150a29ea0be8e32a7fe')
 
 package() {
   cd $srcdir
   install -d $pkgdir/usr/{bin,share/java/$pkgname}
-  unzip -q LanguageTool-stable.zip?$pkgver -d $pkgdir/usr/share
+  unzip -q $pkgname-$pkgver.zip -d $pkgdir/usr/share
   cd $pkgdir/usr/share/
-  mv LanguageTool $pkgname
+  mv LanguageTool-$pkgver $pkgname
   cd $pkgname
-  rm libhunspell-linux* hunspell-darwin* hunspell-win*
-  ln -s /usr/lib/libhunspell-1.3.so libhunspell-linux-x86-32.so
-  ln -s /usr/lib/libhunspell-1.3.so libhunspell-linux-x86-64.so
   mv *.jar $pkgdir/usr/share/java/$pkgname
-  install -m755 $srcdir/languagetool.sh $pkgdir/usr/bin/$pkgname
+  mv libs/*.jar $pkgdir/usr/share/java/$pkgname
+  rm -rf libs
+  install -m755 $srcdir/$pkgname.sh $pkgdir/usr/bin/$pkgname
 }
 

Modified: languagetool.sh
===
--- languagetool.sh 2013-04-02 17:43:50 UTC (rev 87533)
+++ languagetool.sh 2013-04-02 18:01:39 UTC (rev 87534)
@@ -2,11 +2,15 @@
 
 file_present=false
 asked_for_help=false
+start_server=false
 
 for arg in $@; do
   if [[ $arg != -* ]]; then
 file_present=true
   fi
+  if [[ $arg == --config* ]]; then
+start_server=true
+  fi
   if [[ $arg == -h ]]; then
 asked_for_help=true
   fi
@@ -19,8 +23,10 @@
 for name in /usr/share/java/languagetool/*.jar ; do
   CP=$CP:$name
 done
-CLI_command='org.languagetool.Main'
+
+CLI_command='org.languagetool.commandline.Main'
 GUI_command='org.languagetool.gui.Main'
+SRV_command='org.languagetool.server.HTTPSServer'
 
 if $asked_for_help; then
   echo Command-line interface (CLI) help:
@@ -28,11 +34,18 @@
   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 HTTPS server help:
+  $JAVA_HOME/bin/java -cp $CP $SRV_command -h | sed 
s/HTTPSServer/languagetool/
 else
-  if $file_present; then
-$JAVA_HOME/bin/java -cp $CP $CLI_command $@
+  if $start_server; then
+$JAVA_HOME/bin/java -cp $CP $SRV_command $@
   else
-$JAVA_HOME/bin/java -cp $CP $GUI_command $@
+if $file_present; then
+  $JAVA_HOME/bin/java -cp $CP $CLI_command $@
+else
+  $JAVA_HOME/bin/java -cp $CP $GUI_command $@
+fi
   fi
 fi