From 7224292c05c321761ea33a094a0512f56138ec35 Mon Sep 17 00:00:00 2001 From: Vladimir Ischenko Date: Thu, 23 Jan 2025 17:01:21 +0300 Subject: [PATCH] Test refactoring common scripts --- .github/workflows/build_packages.yml | 2 +- install/common/systemd/build.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_packages.yml b/.github/workflows/build_packages.yml index 01f8b28610..9fcf43d475 100644 --- a/.github/workflows/build_packages.yml +++ b/.github/workflows/build_packages.yml @@ -26,7 +26,7 @@ on: deb_build: description: 'Trigger DEB build' required: false - default: 'true' + default: 'false' rpm_build: description: 'Trigger RPM build' required: false diff --git a/install/common/systemd/build.sh b/install/common/systemd/build.sh index eef0854fc0..5b386761da 100644 --- a/install/common/systemd/build.sh +++ b/install/common/systemd/build.sh @@ -214,8 +214,8 @@ reassign_values (){ write_to_file () { [[ -n ${SYSTEMD_ENVIRONMENT} ]] && sed "/^ExecStart=/a Environment=${SYSTEMD_ENVIRONMENT}" -i "$BUILD_PATH"/${PRODUCT}-"${SERVICE_NAME[$i]}".service [[ -n ${DEPENDENCY_LIST} ]] && sed -e "s_\(After=.*\)_\1 ${DEPENDENCY_LIST}_" -e "/After=/a Wants=${DEPENDENCY_LIST}" -i "$BUILD_PATH"/${PRODUCT}-"${SERVICE_NAME[$i]}".service - sed -i -e "s#\${SERVICE_NAME}#${SERVICE_NAME[i]}#g" -e "s#\${WORK_DIR}#${WORK_DIR}#g" -e "s#\${RESTART}#${RESTART}#g" -e "s#\${SYSTEMD_ENVIRONMENT_FILE}#${SYSTEMD_ENVIRONMENT_FILE}#g" \ - -e "s#\${EXEC_START}#${EXEC_START}#g" -e "s#\${SERVICE_TYPE}#${SERVICE_TYPE}#g" "$BUILD_PATH/${PRODUCT}-${SERVICE_NAME[i]}.service" + sed -i -e 's#${SERVICE_NAME}#'$SERVICE_NAME'#g' -e 's#${WORK_DIR}#'$WORK_DIR'#g' -e "s#\${RESTART}#$RESTART#g" -e "s#\${SYSTEMD_ENVIRONMENT_FILE}#$SYSTEMD_ENVIRONMENT_FILE#g" \ + -e "s#\${EXEC_START}#$EXEC_START#g" -e "s#\${SERVICE_TYPE}#$SERVICE_TYPE#g" $BUILD_PATH/${PRODUCT}-${SERVICE_NAME[$i]}.service } mkdir -p "$BUILD_PATH"