lib/lib.sh: Sanitize the tag when making a temporary directory.

[distorted-letsencrypt] / lib / lib.sh

diff --git a/lib/lib.sh b/lib/lib.sh
index 7b4aab1..dd85bbf 100644 (file)
--- a/lib/lib.sh
+++ b/lib/lib.sh
@@ -2,7 +2,7 @@
 
 prog=${0##*/}
 
-usage () { echo "usage: $prog $usage"; }
+usage () { echo "usage: $prog$usage"; }
 fail () { echo >&2 "$prog: $*"; exit 1; }
 fail_usage () { usage >&2; exit 1; }
 
@@ -15,10 +15,12 @@ run_as_user () {
   PATH=$home/bin:/usr/local/bin:/bin:/usr/bin; export PATH
 }
 
+sanitize () { echo "$1" | tr -c 'A-Za-z0-9-\n' _; }
+
 prepare_tmp () {
   tag=$1
 
-  tmp=$home/tmp/$tag.$$
+  tmp=$home/tmp/$(sanitize "$tag").$$
   rm -rf $tmp
   mkdir $tmp
   trap 'cd $home; rm -rf $tmp' EXIT INT TERM
@@ -26,6 +28,8 @@ prepare_tmp () {
 
 make_le_conf () {
   { cat $home/le.conf.skel
+    echo "config-dir = $home/etc"
+    echo "logs-dir = $home/log"
     echo "work-dir = $tmp"
     echo
     case $# in