From 8219f4107e1f846639efa823e2e248b19988c72b Mon Sep 17 00:00:00 2001 From: Attila Levente EGYEDI Date: Thu, 5 May 2016 00:04:52 -0700 Subject: [PATCH] Version change + config for VLC on Ubuntu --- pom.xml | 4 ++-- src/main/resources/bin/start-pco.cmd | 4 ++-- src/main/resources/bin/start-pco.command | 4 ++-- src/main/resources/bin/start-pco.sh | 4 ++-- src/main/resources/config/pco.config.json | 8 +++++++- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 48e6797..c33d41f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.dubylon photo-chaos-organizer-project - 0.1.5-SNAPSHOT + 0.1.5 pom @@ -19,7 +19,7 @@ com.dubylon photo-chaos-organizer-server - 0.1.5-SNAPSHOT + 0.1.5 diff --git a/src/main/resources/bin/start-pco.cmd b/src/main/resources/bin/start-pco.cmd index 5e8412f..3b02c14 100644 --- a/src/main/resources/bin/start-pco.cmd +++ b/src/main/resources/bin/start-pco.cmd @@ -1,8 +1,8 @@ cls @echo ---------------------------------------------- -@echo Launching Photo Chaos Organizer 0.1.5-SNAPSHOT +@echo Launching Photo Chaos Organizer 0.1.5 @echo ---------------------------------------------- @echo off set DIRNAME=%~dp0 -java -jar "%DIRNAME%/photo-chaos-organizer-0.1.5-SNAPSHOT.jar" \ No newline at end of file +java -jar "%DIRNAME%/photo-chaos-organizer-0.1.5.jar" \ No newline at end of file diff --git a/src/main/resources/bin/start-pco.command b/src/main/resources/bin/start-pco.command index 6a348f8..ca947e2 100644 --- a/src/main/resources/bin/start-pco.command +++ b/src/main/resources/bin/start-pco.command @@ -1,9 +1,9 @@ #!/bin/sh clear echo ---------------------------------------------- -echo Launching Photo Chaos Organizer 0.1.5-SNAPSHOT +echo Launching Photo Chaos Organizer 0.1.5 echo ---------------------------------------------- echo DIRNAME=`dirname "$0"` -java -jar $DIRNAME/photo-chaos-organizer-0.1.5-SNAPSHOT.jar \ No newline at end of file +java -jar $DIRNAME/photo-chaos-organizer-0.1.5.jar \ No newline at end of file diff --git a/src/main/resources/bin/start-pco.sh b/src/main/resources/bin/start-pco.sh index 6a348f8..ca947e2 100644 --- a/src/main/resources/bin/start-pco.sh +++ b/src/main/resources/bin/start-pco.sh @@ -1,9 +1,9 @@ #!/bin/sh clear echo ---------------------------------------------- -echo Launching Photo Chaos Organizer 0.1.5-SNAPSHOT +echo Launching Photo Chaos Organizer 0.1.5 echo ---------------------------------------------- echo DIRNAME=`dirname "$0"` -java -jar $DIRNAME/photo-chaos-organizer-0.1.5-SNAPSHOT.jar \ No newline at end of file +java -jar $DIRNAME/photo-chaos-organizer-0.1.5.jar \ No newline at end of file diff --git a/src/main/resources/config/pco.config.json b/src/main/resources/config/pco.config.json index 02f97a7..8aabec4 100644 --- a/src/main/resources/config/pco.config.json +++ b/src/main/resources/config/pco.config.json @@ -11,12 +11,18 @@ "${videoFile}" ] }, - "VLC": { + "VLC on OS X": { "executable": "/Applications/VLC 2.1.0.app/Contents/MacOS/VLC", "arguments": [ "--intf macosx", "${videoFile}" ] + }, + "VLC on Ubuntu": { + "executable": "/usr/bin/vlc", + "arguments": [ + "${videoFile}" + ] } }, "defaultPlayer": "MPlayer"