From 1c7eaf1b76e64e23101bdb65affb1fc9f3c65dc2 Mon Sep 17 00:00:00 2001 From: Pedro Pombeiro Date: Tue, 19 Feb 2019 19:20:47 +0100 Subject: [PATCH] Replace sed with jq in build-desktop.sh --- scripts/build-desktop.sh | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/scripts/build-desktop.sh b/scripts/build-desktop.sh index 24f899ccdd..7f3ba6be09 100755 --- a/scripts/build-desktop.sh +++ b/scripts/build-desktop.sh @@ -165,21 +165,12 @@ function buildClojureScript() { echo "" # Add path to javascript bundle to package.json - jsBundleLine="\"desktopJSBundlePath\": \"$WORKFOLDER/Status.jsbundle\"" - jsPackagePath=$(joinExistingPath "$STATUSREACTPATH" 'desktop_files/package.json.orig') - if grep -Fq "$jsBundleLine" "$jsPackagePath"; then - echo -e "${GREEN}Found line in package.json.${NC}" - else - # Add line to package.json just before "dependencies" line - if is_macos; then - sed -i '' -e "/\"dependencies\":/i\\ - \ $jsBundleLine," "$jsPackagePath" - else - sed -i -- "/\"dependencies\":/i\ $jsBundleLine," "$jsPackagePath" - fi - echo -e "${YELLOW}Added 'desktopJSBundlePath' line to $jsPackagePath:${NC}" - echo "" - fi + local jsBundleLine="\"desktopJSBundlePath\": \"$WORKFOLDER/Status.jsbundle\"" + local jsPackagePath=$(joinExistingPath "$STATUSREACTPATH" 'desktop_files/package.json.orig') + local tmp=$(mktemp) + jq ".=(. + {$jsBundleLine})" "$jsPackagePath" > "$tmp" && mv "$tmp" "$jsPackagePath" + echo -e "${YELLOW}Added 'desktopJSBundlePath' line to $jsPackagePath:${NC}" + echo "" } function compile() {