diff options
| author |   José Bollo <jose.bollo@iot.bzh> | 2018-02-27 15:07:54 +0100 |
|---|---|---|
| committer | José Bollo <jose.bollo@iot.bzh> | 2018-02-28 09:15:17 +0100 |
| commit | 3d50d615fbd4322315dd66859d886576e208b36d (patch) | |
| tree | cb94b3865a65f5210d253eb52763ea68bfad68ba /scripts | |
| parent | e6fc32e9185b5d6c1ea97714a37f1112b54f64fb (diff) | |
Add configuration variables for runtime socket dirs
2 new configuration variables:
- afm_platform_rundir (default /run/platform)
Path to location of platform runtime sockets
- afm_users_rundir (default /run/user)
Path to location of users runtime sockets
Change-Id: I65007fee1ca2ce6f1247a67ba0b121f97c08f209
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/CMakeLists.txt | 6 | ||||
| -rwxr-xr-x | scripts/afm-debug.in (renamed from scripts/afm-debug) | 2 | ||||
| -rwxr-xr-x | scripts/afm-util.in (renamed from scripts/afm-util) | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index e0f80ac..b1ba1d7 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -19,10 +19,12 @@ cmake_minimum_required(VERSION 2.8) if(NOT USE_SDK) - install(PROGRAMS afm-util DESTINATION ${CMAKE_INSTALL_BINDIR}) + configure_file(afm-util.in afm-util) + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/afm-util DESTINATION ${CMAKE_INSTALL_BINDIR}) install(PROGRAMS afm-install DESTINATION ${CMAKE_INSTALL_BINDIR}) if(AGL_DEVEL) - install(PROGRAMS afm-debug DESTINATION ${CMAKE_INSTALL_BINDIR}) + configure_file(afm-debug.in afm-debug) + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/afm-debug DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() endif() diff --git a/scripts/afm-debug b/scripts/afm-debug.in index 18ecae2..e676469 100755 --- a/scripts/afm-debug +++ b/scripts/afm-debug.in @@ -36,7 +36,7 @@ function info() { } # setup debug dir (shared with service file) -DBGDIR=/var/run/afm-debug +DBGDIR=@afm_platform_rundir@/debug mkdir -p $DBGDIR # check application name passed as first arg by gdb diff --git a/scripts/afm-util b/scripts/afm-util.in index c5e48eb..40bc7da 100755 --- a/scripts/afm-util +++ b/scripts/afm-util.in @@ -1,7 +1,7 @@ #!/bin/bash send() { - afb-client-demo -H -d unix:/run/afm/apis/ws/afm-main "$1" "$2" | + afb-client-demo -H -d unix:@afm_platform_rundir@/apis/ws/afm-main "$1" "$2" | awk '$1=="ON-REPLY-FAIL"{$1="ERROR:";$2="";print;exit 1;}NR>1' } |