Browse Source

use safer mktemp

tags/v1.4.17
Jonathan Cobb 3 years ago
parent
commit
c23e638937
2 changed files with 3 additions and 3 deletions
  1. +2
    -2
      bin/bubble_common
  2. +1
    -1
      bubble-server/src/main/resources/packer/roles/bubble/files/bubble_restore_monitor.sh

+ 2
- 2
bin/bubble_common View File

@@ -35,13 +35,13 @@ function handle_help_request () {
function make_temp () { function make_temp () {
prefix="${1}" prefix="${1}"
suffix="${2}" suffix="${2}"
echo "$(mktemp ${prefix}.XXXXXXXX${suffix})"
echo "$(mktemp ${prefix}.${suffix}.XXXXXXXX)"
} }


function make_temp_dir () { function make_temp_dir () {
prefix="${1}" prefix="${1}"
suffix="${2}" suffix="${2}"
echo "$(mktemp -d ${prefix}.XXXXXXXX${suffix})"
echo "$(mktemp -d ${prefix}.${suffix}.XXXXXXXX)"
} }


function quote_args () { function quote_args () {


+ 1
- 1
bubble-server/src/main/resources/packer/roles/bubble/files/bubble_restore_monitor.sh View File

@@ -71,7 +71,7 @@ cp ${RESTORE_BASE}/bubble.jar ${BUBBLE_HOME}/api/bubble.jar


# set wasRestored flag in self_node.json # set wasRestored flag in self_node.json
log "Adding wasRestored=true to ${SELF_NODE}" log "Adding wasRestored=true to ${SELF_NODE}"
TEMP_SELF=$(mktemp /tmp/self_node.XXXXXXX.json)
TEMP_SELF=$(mktemp /tmp/self_node.json.XXXXXXX)
cat ${BUBBLE_SELF_NODE} | jq '.wasRestored = true' > ${TEMP_SELF} || die "Error adding 'wasRestored' flag to ${SELF_NODE}" cat ${BUBBLE_SELF_NODE} | jq '.wasRestored = true' > ${TEMP_SELF} || die "Error adding 'wasRestored' flag to ${SELF_NODE}"
cat ${TEMP_SELF} > ${BUBBLE_SELF_NODE} || die "Error rewriting ${SELF_NODE}" cat ${TEMP_SELF} > ${BUBBLE_SELF_NODE} || die "Error rewriting ${SELF_NODE}"




Loading…
Cancel
Save