From b87fa6f361fd0c27383d78a503ed2c28a8bdef1a Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 13 Nov 2016 11:48:15 +1300 Subject: Some fixes for packaging scripts --- setup/package.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'setup/package.sh') diff --git a/setup/package.sh b/setup/package.sh index acbac434b..c425308ed 100755 --- a/setup/package.sh +++ b/setup/package.sh @@ -23,18 +23,19 @@ check_requirement () { } check_requirement "ls ../../ext-6.0.1" "Missing ../../ext-6.0.1 (https://www.sencha.com/legal/GPL/)" -check_requirement "ls yajsw-*.zip" "Missing yajsw-*.zip (http://yajsw.sourceforge.net/)" +check_requirement "ls yajsw-*.zip" "Missing yajsw-*.zip (https://sourceforge.net/projects/yajsw/files/)" check_requirement "ls innosetup-*.exe" "Missing isetup-*.exe (http://www.jrsoftware.org/isdl.php)" check_requirement "which sencha" "Missing sencha cmd package (https://www.sencha.com/products/extjs/cmd-download/)" check_requirement "which wine" "Missing wine package" check_requirement "which innoextract" "Missing innoextract package" check_requirement "which makeself" "Missing makeself package" +check_requirement "which dos2unix" "Missing dos2unix package" prepare () { unzip yajsw-*.zip mv yajsw-*/ yajsw/ - ../web/../tools/minify.sh + ../traccar-web/tools/minify.sh innoextract innosetup-*.exe echo "If you got any errors here try isetup version 5.5.5 (or check supported versions using 'innoextract -v')" @@ -43,7 +44,7 @@ prepare () { cleanup () { rm -r yajsw/ - rm ../web/app.min.js + rm ../traccar-web/web/app.min.js rm -r app/ } @@ -91,7 +92,9 @@ copy_files () { cp ../target/tracker-server.jar out cp ../target/lib/* out/lib cp ../schema/* out/schema - cp -r ../web/* out/web + cp -r ../templates/* out/templates + cp -r ../traccar-web/web/* out/web + cp default.xml out/conf cp traccar.xml out/conf } @@ -114,6 +117,7 @@ package_unix () { mkdir -p out/{bin,conf,data,lib,logs,web,schema,templates} copy_wrapper "bin" + find out/bin -type f -print0 | xargs -0 dos2unix copy_files makeself out traccar.run "traccar" "\ -- cgit v1.2.3 From c58c2da73ce1ed18d003827ca0e14b0364cb7a45 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Tue, 15 Nov 2016 23:04:39 +1300 Subject: Fix line endings in all scripts --- setup/package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup/package.sh') diff --git a/setup/package.sh b/setup/package.sh index c425308ed..70046f74f 100755 --- a/setup/package.sh +++ b/setup/package.sh @@ -117,7 +117,7 @@ package_unix () { mkdir -p out/{bin,conf,data,lib,logs,web,schema,templates} copy_wrapper "bin" - find out/bin -type f -print0 | xargs -0 dos2unix + find out -type f -name \*.sh -print0 | xargs -0 dos2unix copy_files makeself out traccar.run "traccar" "\ -- cgit v1.2.3 From 2b0a470a10e6b8277365da535da1a9c7ce8fefce Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Tue, 15 Nov 2016 23:53:04 +1300 Subject: Another fix for packaging script --- setup/package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup/package.sh') diff --git a/setup/package.sh b/setup/package.sh index 70046f74f..1160a460a 100755 --- a/setup/package.sh +++ b/setup/package.sh @@ -117,7 +117,7 @@ package_unix () { mkdir -p out/{bin,conf,data,lib,logs,web,schema,templates} copy_wrapper "bin" - find out -type f -name \*.sh -print0 | xargs -0 dos2unix + find out -type f -name \*.sh -o -name \*.vm -print0 | xargs -0 dos2unix copy_files makeself out traccar.run "traccar" "\ -- cgit v1.2.3 From d189e3a74327a56bcddd6cc58ec16bb495aff13c Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 16 Nov 2016 02:39:19 +1300 Subject: Fix another packaging issue --- setup/package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup/package.sh') diff --git a/setup/package.sh b/setup/package.sh index 1160a460a..da4b3cc47 100755 --- a/setup/package.sh +++ b/setup/package.sh @@ -117,7 +117,7 @@ package_unix () { mkdir -p out/{bin,conf,data,lib,logs,web,schema,templates} copy_wrapper "bin" - find out -type f -name \*.sh -o -name \*.vm -print0 | xargs -0 dos2unix + find out -type f \( -name \*.sh -o -name \*.vm \) -print0 | xargs -0 dos2unix copy_files makeself out traccar.run "traccar" "\ -- cgit v1.2.3 From 5a8811809f3dd5ff979d6137636619be8b9f8598 Mon Sep 17 00:00:00 2001 From: cvsz Date: Wed, 16 Nov 2016 03:31:58 +0700 Subject: Add traccar.sh for package_universal --- setup/package.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'setup/package.sh') diff --git a/setup/package.sh b/setup/package.sh index 1160a460a..926dc7323 100755 --- a/setup/package.sh +++ b/setup/package.sh @@ -149,7 +149,8 @@ package_universal () { copy_files cp README.txt out - + cp traccar.sh out + cd out zip -r ../traccar-other-$VERSION.zip * cd .. -- cgit v1.2.3 From 2e3f8e38ec95767cb62c72edeec746e0a4799485 Mon Sep 17 00:00:00 2001 From: CVSz Date: Wed, 16 Nov 2016 06:26:16 +0700 Subject: Update package.sh --- setup/package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup/package.sh') diff --git a/setup/package.sh b/setup/package.sh index 926dc7323..d168762d6 100755 --- a/setup/package.sh +++ b/setup/package.sh @@ -149,7 +149,7 @@ package_universal () { copy_files cp README.txt out - cp traccar.sh out + cp other/traccar.sh out cd out zip -r ../traccar-other-$VERSION.zip * -- cgit v1.2.3 From a1ee762bcd59a8105173f19c7df240902f842cb2 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 20 Nov 2016 15:03:11 +1300 Subject: Adjust init scripts location (fix #2563) --- setup/package.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'setup/package.sh') diff --git a/setup/package.sh b/setup/package.sh index 4aba86328..47fbc5572 100755 --- a/setup/package.sh +++ b/setup/package.sh @@ -71,6 +71,7 @@ copy_wrapper () { echo "wrapper.ntservice.name=traccar" >> out/conf/wrapper.conf echo "wrapper.ntservice.displayname=Traccar" >> out/conf/wrapper.conf echo "wrapper.ntservice.description=Traccar" >> out/conf/wrapper.conf + echo "wrapper.daemon.run_level_dir=/etc/rcX.d" >> out/conf/wrapper.conf cp -r yajsw/lib/core out/lib rm out/lib/core/ReadMe.txt -- cgit v1.2.3 From 41c411765d9f47bb129c0f65e99b24d6a3730392 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 20 Nov 2016 16:24:16 +1300 Subject: Better fix for the start scripts (fix #2563) --- setup/package.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'setup/package.sh') diff --git a/setup/package.sh b/setup/package.sh index 47fbc5572..f29b18942 100755 --- a/setup/package.sh +++ b/setup/package.sh @@ -71,13 +71,9 @@ copy_wrapper () { echo "wrapper.ntservice.name=traccar" >> out/conf/wrapper.conf echo "wrapper.ntservice.displayname=Traccar" >> out/conf/wrapper.conf echo "wrapper.ntservice.description=Traccar" >> out/conf/wrapper.conf - echo "wrapper.daemon.run_level_dir=/etc/rcX.d" >> out/conf/wrapper.conf - cp -r yajsw/lib/core out/lib - rm out/lib/core/ReadMe.txt - - cp -r yajsw/lib/extended out/lib - rm out/lib/extended/ReadMe.txt + cp -r yajsw/lib/* out/lib + find out/lib -type f -name ReadMe.txt -exec rm -f {} \; cp yajsw/templates/* out/templates -- cgit v1.2.3 From 82f51b570a0957587b25b48fdb5cfd21c4b14e9d Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 20 Nov 2016 20:22:15 +1300 Subject: One more fix attempt (fix #2563) --- setup/package.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'setup/package.sh') diff --git a/setup/package.sh b/setup/package.sh index f29b18942..a6b54717d 100755 --- a/setup/package.sh +++ b/setup/package.sh @@ -71,6 +71,7 @@ copy_wrapper () { echo "wrapper.ntservice.name=traccar" >> out/conf/wrapper.conf echo "wrapper.ntservice.displayname=Traccar" >> out/conf/wrapper.conf echo "wrapper.ntservice.description=Traccar" >> out/conf/wrapper.conf + echo "wrapper.daemon.run_level_dir=\${if (new File('/etc/rc0.d').exists()) return '/etc/rcX.d' else return '/etc/init.d/rcX.d'}" >> out/conf/wrapper.conf cp -r yajsw/lib/* out/lib find out/lib -type f -name ReadMe.txt -exec rm -f {} \; -- cgit v1.2.3