Shellcheck

Author: bitplane

src/lifecap

@@ -1,11 +1,12 @@
-#!/bin/bash
+#!/bin/sh
 
 HELP="Usage: lifecap [command]
 
 lifecap captures a stream of events about your life, to feed into summarization
 and aggregation systems. The idea is that we use collectors to gather data,
 which publish events to topics that other collectors might be interested in.
 "
-. $(dirname $0)/lifecap_lib.sh
+. "$(dirname "$0")"/lifecap_lib.sh
 
+echo "$HELP"
 

src/lifecap-collector

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 HELP="Lifecap collectors
 
@@ -8,5 +8,7 @@ below by adding programs with lifecap-collector-name* to your path.
 See --help on the collectors themselves for configuration and use.
 "
 
-. $(dirname $0)/lifecap_lib.sh
+. "$(dirname "$0")"/lifecap_lib.sh
+
+echo "$HELP"
 

src/lifecap-config

@@ -1,12 +1,12 @@
-#!/bin/bash
+#!/bin/sh
 
 HELP="Usage: lifecap config [command]
 
 Lists the config"
 
-. $(dirname $0)/lifecap_lib.sh
+. "$(dirname "$0")"/lifecap_lib.sh
 
-echo config_dir: $config_dir
-echo cache_dir: $cache_dir
-echo data_dir: $data_dir
+echo config_dir: "$config_dir"
+echo cache_dir: "$cache_dir"
+echo data_dir: "$data_dir"
 

src/lifecap-job

@@ -1,10 +1,10 @@
-#!/bin/bash
+#!/bin/sh
 
 HELP="Usage: lifecap job [command]
 
 Commands to do with data collection jobs."
 
-. $(dirname $0)/lifecap_lib.sh
+. "$(dirname "$0")"/lifecap_lib.sh
 
 echo "$HELP"
 

src/lifecap-job-add

@@ -5,27 +5,28 @@ HELP="Usage: lifecap job add <name> <collector_name> [collector options]
 Adds a data collection job.
 "
 
-. $(dirname $0)/lifecap_lib.sh
+. "$(dirname "$0")"/lifecap_lib.sh
 
 name="$1"
 collector="$2"
-shift 2
 
 if [ -z "$name" ] || [ -z "$collector" ]; then
     echo "$HELP" >&2
     exit 1
 fi
 
-job_dir="$data_dir/jobs/$name"
+shift 2
+
+job_dir="$config_dir/jobs/$name"
 
-safe_path "$data_dir/jobs" "$name"
+safe_path "$job_dir"
 
 if [ -e "$job_dir" ]; then
     echo "Job '$name' already exists" >&2
     exit 1
 fi
 
-if [ -z "$(lifecap collector options | grep "$collector")" ]; then
+if ! "$(lifecap collector options | grep -q "$collector")"; then
     echo "Collector '$collector' doesn't exist" >&2
     echo "Options: $(lifecap collector options)" >&2
     exit 1
@@ -37,6 +38,7 @@ mkdir -p "$job_dir"
 # Configure the collector
 if ! lifecap collector "$collector" setup "$job_dir" "$@"; then
     echo "Job creation failed." >&2
-    rm -r $job_dir
+    rm -r "$job_dir"
+    exit 1
 fi
 

src/lifecap-job-ls

@@ -1,9 +1,9 @@
-#!/bin/bash
+#!/bin/sh
 
 HELP="Usage: lifecap collector ls
 
 Lists currently installed collectors"
 
-. $(dirname $0)/lifecap_lib.sh
+. "$(dirname "$0")"/lifecap_lib.sh
 
-ls -1 $config_dir/collectors
+ls -1 "$config_dir/collectors"

src/lifecap-job-rm

@@ -1,11 +1,19 @@
-#!/bin/bash
+#!/bin/sh
 
-HELP="Usage: lifecap collector ls
+HELP="Usage: lifecap job rm <name>
 
 Lists currently installed collectors"
 
-. $(dirname $0)/lifecap_lib.sh
+. "$(dirname "$0")"/lifecap_lib.sh
 
-set -e
+if [ -z "$1" ]; then
+    echo "No such job"
+    echo "Jobs: $(ls "$config_dir"/collectors)"
+fi
+
+path="$config_dir/collectors/$1"
+
+path_exists "$path"
+
+rm "$path"
 
-rm "$config_dir/collectors/$1"

src/lifecap-topic

@@ -4,7 +4,7 @@ HELP="Usage: lifecap topic [command]
 
 Topics are channels where data flows."
 
-. $(dirname $0)/lifecap_lib.sh
+. "$(dirname "$0")"/lifecap_lib.sh
 
-echo $HELP >&2
+echo "$HELP" >&2
 exit 1

src/lifecap-topic-ls

@@ -1,10 +1,10 @@
-#!/bin/bash
+#!/bin/sh
 
 HELP="Usage: lifecap topic ls [pattern]
 
 List existing topics"
 
-. $(dirname $0)/lifecap_lib.sh
+. "$(dirname "$0")"/lifecap_lib.sh
 
 ls -1 "$data_dir/topics/$1"
 

src/lifecap-topic-rm

@@ -4,24 +4,10 @@ HELP="Usage: lifecap topic rm <name>
 
 Remove a topic by name"
 
-. $(dirname $0)/lifecap_lib.sh
+. "$(dirname "$0")"/lifecap_lib.sh
 
-# Reject wildcards/globs
-case "$1" in
-  *[\*\?]* )
-    echo "Wildcards not allowed!"
-    exit 1
-    ;;
-  *\.\.* )
-    echo "No traversal, thanks."
-    exit 1
-    ;;
-esac
+path="$data_dir/topics/$1"
+path_exists "$path"
 
-# Resolve full path and ensure it’s under
-path=$data_dir/topics/$1
-real_path=$(cd "$(dirname "$path")" && pwd -P)/$(basename "$path")
-[ ! "$real_path" = "$path" ] && echo "Invalid path!" && exit 1
-
-rm -r $path
+rm -r "$path"