Looks good. On 08/18/2011 05:42 PM, Adam Stokes wrote:

• Our naming scheme for consoles 'sysconfig-console' is causing errors in the initscript. The '-' is making bash think it is some sort of command line options rather than a variable to be read. Resolves rhbz#727194

The correct problem here is that `-' is not valid character in variable names

Signed-off-by: Adam Stokesastokes@fedoraproject.org

matahari.init.in | 4 ++-- src/sysconfig/CMakeLists.txt | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/matahari.init.in b/matahari.init.in index c873cd4..ea51d2d 100644 --- a/matahari.init.in +++ b/matahari.init.in @@ -24,8 +24,8 @@ # Source function library. . @sysconfdir@/rc.d/init.d/functions

-SERVICE=matahari-@BASE@ -PROCESS=matahari-qmf-@BASE@d +SERVICE=matahari-@BASE@@BASE_SUB@ +PROCESS=matahari-qmf-@BASE@@BASE_SUB@d

RETVAL=0

diff --git a/src/sysconfig/CMakeLists.txt b/src/sysconfig/CMakeLists.txt index 1d9fba8..89acc04 100644 --- a/src/sysconfig/CMakeLists.txt +++ b/src/sysconfig/CMakeLists.txt @@ -18,11 +18,9 @@ if(WITH-QMF) if(NOT WIN32) configure_file(${CMAKE_SOURCE_DIR}/matahari.init.in ${CMAKE_CURRENT_BINARY_DIR}/matahari-${BASE}) install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/matahari-${BASE} DESTINATION ${initdir})

• # Override BASE for matahari-sysconfig-console
  

• unset(BASE)
  

• set(BASE "sysconfig-console")
  

• configure_file(${CMAKE_SOURCE_DIR}/matahari.init.in ${CMAKE_CURRENT_BINARY_DIR}/matahari-${BASE})
  

• install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/matahari-${BASE} DESTINATION ${initdir})
  

• set(BASE_SUB "-console")
  

• configure_file(${CMAKE_SOURCE_DIR}/matahari.init.in ${CMAKE_CURRENT_BINARY_DIR}/matahari-${BASE}${BASE_SUB})
  

• install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/matahari-${BASE}${BASE_SUB} DESTINATION ${initdir})
  

  endif(NOT WIN32)

  install(TARGETS ${QMF_AGENT} DESTINATION sbin)