Browse Source

Address shellcheck complaints

expose_links
Drew Short 5 years ago
parent
commit
1c936a27d2
  1. 18
      assets/common.sh
  2. 24
      assets/out

18
assets/common.sh

@ -1,3 +1,4 @@
#!/usr/bin/bash
export TMPDIR=${TMPDIR:-/tmp}
load_config() {
@ -5,11 +6,11 @@ load_config() {
local rclone_config_path=/opt/rclone/config
local rclone_config_file=$rclone_config_path/.rclone.conf
(jq -r '.source.config // empty' < $1) > $config_path
(jq -r '.source.config // empty' < "$1") > "$config_path"
if [ -s $config_path ]; then
if [ -s "$config_path" ]; then
mkdir -p $rclone_config_path
mv $config_path $rclone_config_file
mv "$config_path" $rclone_config_file
# TODO: Remove Me - DEBUGGING
echo "Config file:"
cat $rclone_config_file
@ -22,19 +23,22 @@ load_config() {
load_files() {
set +e
local files=$(jq -r '.source.files? | keys? | join(" ") // ""' < $1)
local files
files=$(jq -r '.source.files? | keys? | join(" ") // ""' < "$1")
set -e
# TODO: Remove Me - DEBUGGING
echo "Files:"
echo $files
echo "$files"
if [[ ! -z "${files}" ]]; then
for fileName in $files; do
local jq_path=".source.files.${fileName}"
local content=$(jq -r "${jq_path}" < $1)
local content=$(jq -r "${jq_path}" < "$1")
echo "$content" > "/tmp/${fileName}"
# TODO: Remove Me - DEBUGGING
echo "File /tmp/${fileName}"
cat /tmp/${fileName}
cat "/tmp/${fileName}"
done
fi
}

24
assets/out

@ -23,17 +23,17 @@ fi
PATH=/usr/local/bin:$PATH
payload=$(mktemp $TMPDIR/rclone-resource-request.XXXXXX)
cat > $payload <&0
cat > "$payload" <&0
# TODO: Remove Me - DEBUGGING
echo "Payload:"
cat $payload
cat "$payload"
load_config $payload
load_files $payload
load_config "$payload"
load_files "$payload"
rclone_source_directory=$(jq -r '.params.source // ""' < $payload)
rclone_destinations=$(jq -r '.params.destination[]? | .dir // ""' < $payload)
rclone_source_directory=$(jq -r '.params.source // ""' < "$payload")
rclone_destinations=$(jq -r '.params.destination[]? | .dir // ""' < "$payload")
if [ -z "$rclone_source_directory" ]; then
echo "invalid source directory (missing source)"
@ -50,9 +50,9 @@ echo "Destinations:"
jq -c '.params.destination[] | .dir' < $payload
local_source_dir="${source}/${rclone_source_directory}"
ls -alh ${local_source_dir}
ls -alh "${local_source_dir}"
sha256=$((find ${local_source_dir} -type f -exec sha256sum {} \;) | cut -d ' ' -f1)
sha256=$( (find "${local_source_dir}" -type f -exec sha256sum {} \;) | cut -d ' ' -f1 )
echo "sha256:${sha256}"
@ -60,13 +60,13 @@ echo "sha256:${sha256}"
rclone_source="local:${local_source_dir}"
echo "Source: ${rclone_source}"
destinations=$(jq -r '.params.destination[] | @base64' < $payload)
destinations=$(jq -r '.params.destination[] | @base64' < "$payload")
echo "Using encoded destinations:"
echo " ${destinations}"
for destination in $destinations; do
_jq() {
echo ${destination} | base64 -d | jq -r ${1}
echo "${destination}" | base64 -d | jq -r "${1}"
}
rclone_destination=$(_jq '.dir')
@ -75,9 +75,9 @@ for destination in $destinations; do
rclone_destination_subdir_file=$(_jq '.subdir // ""')
echo "Destination subdir file: ${rclone_destination_subdir_file}"
rclone_destination_subdir=""
if [ ! -z "$rclone_destination_subdir_file" ]; then
if [ -n "$rclone_destination_subdir_file" ]; then
echo "Looking in ${source}/${rclone_destination_subdir_file} for subdir to use"
rclone_destination_subdir=$(cat "${source}/${rclone_destination_subdir_file}" | head -n 1)
rclone_destination_subdir=$(head -n 1 < "${source}/${rclone_destination_subdir_file}")
fi
rclone_target="${rclone_destination}/${rclone_destination_subdir}"

Loading…
Cancel
Save