From 45c9ef5ffee4431cbdb8c774510f9c357823e275 Mon Sep 17 00:00:00 2001 From: tkellner Date: Wed, 10 Apr 2013 19:30:28 +0000 Subject: Add hyphen to remaining files git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@354 174cde9d-5d70-4d2a-aa98-46368bc2aaf7 --- pdf-over-gui/src/main/jnlp/pdf-over.jnlp | 6 +++--- pdf-over-gui/src/main/resources/izpack/install.xml | 6 +++--- pdf-over-gui/src/main/resources/izpack/unix_shortcutSpec.xml | 2 +- pdf-over-gui/src/main/resources/scripts/pdf-over_linux.sh | 3 +++ pdf-over-gui/src/main/resources/scripts/pdf-over_mac.sh | 4 ++++ pdf-over-gui/src/main/resources/scripts/pdf-over_win.bat | 1 + pdf-over-gui/src/main/resources/scripts/pdfover_linux.sh | 3 --- pdf-over-gui/src/main/resources/scripts/pdfover_mac.sh | 4 ---- pdf-over-gui/src/main/resources/scripts/pdfover_win.bat | 1 - publish.sh | 10 +++++----- 10 files changed, 20 insertions(+), 20 deletions(-) create mode 100644 pdf-over-gui/src/main/resources/scripts/pdf-over_linux.sh create mode 100644 pdf-over-gui/src/main/resources/scripts/pdf-over_mac.sh create mode 100644 pdf-over-gui/src/main/resources/scripts/pdf-over_win.bat delete mode 100644 pdf-over-gui/src/main/resources/scripts/pdfover_linux.sh delete mode 100644 pdf-over-gui/src/main/resources/scripts/pdfover_mac.sh delete mode 100644 pdf-over-gui/src/main/resources/scripts/pdfover_win.bat diff --git a/pdf-over-gui/src/main/jnlp/pdf-over.jnlp b/pdf-over-gui/src/main/jnlp/pdf-over.jnlp index 83d380ca..f5264c8d 100644 --- a/pdf-over-gui/src/main/jnlp/pdf-over.jnlp +++ b/pdf-over-gui/src/main/jnlp/pdf-over.jnlp @@ -23,17 +23,17 @@ - + - + - + diff --git a/pdf-over-gui/src/main/resources/izpack/install.xml b/pdf-over-gui/src/main/resources/izpack/install.xml index 1a487821..aa88d3ab 100644 --- a/pdf-over-gui/src/main/resources/izpack/install.xml +++ b/pdf-over-gui/src/main/resources/izpack/install.xml @@ -65,13 +65,13 @@ - - - diff --git a/pdf-over-gui/src/main/resources/izpack/unix_shortcutSpec.xml b/pdf-over-gui/src/main/resources/izpack/unix_shortcutSpec.xml index 141af350..3b69c380 100644 --- a/pdf-over-gui/src/main/resources/izpack/unix_shortcutSpec.xml +++ b/pdf-over-gui/src/main/resources/izpack/unix_shortcutSpec.xml @@ -12,7 +12,7 @@ applications="no" startMenu="yes" startup="no" - target="$INSTALL_PATH/scripts/pdfover_linux.sh" + target="$INSTALL_PATH/scripts/pdf-over_linux.sh" commandLine="" workingDirectory="$INSTALL_PATH" description="PDF-Over 4.0" diff --git a/pdf-over-gui/src/main/resources/scripts/pdf-over_linux.sh b/pdf-over-gui/src/main/resources/scripts/pdf-over_linux.sh new file mode 100644 index 00000000..b9395340 --- /dev/null +++ b/pdf-over-gui/src/main/resources/scripts/pdf-over_linux.sh @@ -0,0 +1,3 @@ +#!/bin/sh +BASEDIR=`dirname $0` +(cd "$BASEDIR/.." && exec java -cp "lib/*" at.asit.pdfover.gui.Main "$@") diff --git a/pdf-over-gui/src/main/resources/scripts/pdf-over_mac.sh b/pdf-over-gui/src/main/resources/scripts/pdf-over_mac.sh new file mode 100644 index 00000000..e4cd4722 --- /dev/null +++ b/pdf-over-gui/src/main/resources/scripts/pdf-over_mac.sh @@ -0,0 +1,4 @@ +#!/bin/sh +BASEDIR=$(cd "$(dirname "$0")"; pwd) +export LC_CTYPE="UTF-8" +(cd "$BASEDIR/PDF-Over" && exec java -XstartOnFirstThread -cp "lib/*" at.asit.pdfover.gui.Main "$@" &) diff --git a/pdf-over-gui/src/main/resources/scripts/pdf-over_win.bat b/pdf-over-gui/src/main/resources/scripts/pdf-over_win.bat new file mode 100644 index 00000000..ae0cbbca --- /dev/null +++ b/pdf-over-gui/src/main/resources/scripts/pdf-over_win.bat @@ -0,0 +1 @@ +@start /b javaw -jar lib\pdf-over-gui-4.0.0-SNAPSHOT.jar %* \ No newline at end of file diff --git a/pdf-over-gui/src/main/resources/scripts/pdfover_linux.sh b/pdf-over-gui/src/main/resources/scripts/pdfover_linux.sh deleted file mode 100644 index b9395340..00000000 --- a/pdf-over-gui/src/main/resources/scripts/pdfover_linux.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -BASEDIR=`dirname $0` -(cd "$BASEDIR/.." && exec java -cp "lib/*" at.asit.pdfover.gui.Main "$@") diff --git a/pdf-over-gui/src/main/resources/scripts/pdfover_mac.sh b/pdf-over-gui/src/main/resources/scripts/pdfover_mac.sh deleted file mode 100644 index e4cd4722..00000000 --- a/pdf-over-gui/src/main/resources/scripts/pdfover_mac.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -BASEDIR=$(cd "$(dirname "$0")"; pwd) -export LC_CTYPE="UTF-8" -(cd "$BASEDIR/PDF-Over" && exec java -XstartOnFirstThread -cp "lib/*" at.asit.pdfover.gui.Main "$@" &) diff --git a/pdf-over-gui/src/main/resources/scripts/pdfover_win.bat b/pdf-over-gui/src/main/resources/scripts/pdfover_win.bat deleted file mode 100644 index ae0cbbca..00000000 --- a/pdf-over-gui/src/main/resources/scripts/pdfover_win.bat +++ /dev/null @@ -1 +0,0 @@ -@start /b javaw -jar lib\pdf-over-gui-4.0.0-SNAPSHOT.jar %* \ No newline at end of file diff --git a/publish.sh b/publish.sh index 0b77efe8..33a7d7c1 100755 --- a/publish.sh +++ b/publish.sh @@ -52,7 +52,7 @@ names=( linux windows mac ) for (( i = 0 ; i < ${#names[@]} ; i++ )) do PROFILE=${profiles[$i]} NAME=${names[$i]} - INSTALLER=setup_pdfover_$NAME.jar + INSTALLER=setup_pdf-over_$NAME.jar begin_phase "Building package [$PROFILE] as $INSTALLER..." mvn install -P$PROFILE $MVN_PARAMS > $LOG_DIR/build_$NAME.log 2>&1 RETVAL=$? @@ -74,22 +74,22 @@ for (( i = 0 ; i < ${#names[@]} ; i++ )) do done begin_phase "Building JNLP..." -cp ./pdf-over-gui/src/main/jnlp/pdfover.jnlp $PUBLISH_DIR/pdfover.jnlp +cp ./pdf-over-gui/src/main/jnlp/pdf-over.jnlp $PUBLISH_DIR/pdf-over.jnlp RETVAL=$? if [ $RETVAL -ne 0 ]; then end_phase "FAILED" else - sed -i "s/##CODEBASE_URL##/$CODEBASE_URL/g" $PUBLISH_DIR/pdfover.jnlp + sed -i "s/##CODEBASE_URL##/$CODEBASE_URL/g" $PUBLISH_DIR/pdf-over.jnlp RETVAL=$? if [ $RETVAL -ne 0 ]; then end_phase "FAILED" else - sed -i "s/##CONTEXT_URL##/$CONTEXT_URL/g" $PUBLISH_DIR/pdfover.jnlp + sed -i "s/##CONTEXT_URL##/$CONTEXT_URL/g" $PUBLISH_DIR/pdf-over.jnlp RETVAL=$? if [ $RETVAL -ne 0 ]; then end_phase "FAILED" else - sed -i "s/##HOMEPAGE_URL##/$HOMEPAGE_URL/g" $PUBLISH_DIR/pdfover.jnlp + sed -i "s/##HOMEPAGE_URL##/$HOMEPAGE_URL/g" $PUBLISH_DIR/pdf-over.jnlp RETVAL=$? if [ $RETVAL -ne 0 ]; then end_phase "FAILED" -- cgit v1.2.3