salt/bin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tmp: Update help text, add more directory permissions checking

Browse Source
This commit is contained in:
Salt 2019-02-10 12:29:23 -06:00
parent 6637e750c9
commit a544d9827d
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tmp
View File

@ -34,7 +34,7 @@ while getopts ":h" opt; do
cat << EOF cat << EOF
Usage: $name [TEMPLATE] Usage: $name [TEMPLATE]
Create a temporary directory, copying the folder [TEMPLATE] from Create a temporary directory, copying the folder [TEMPLATE] from
~/Templates/tmp, if it exists. [XDG_TEMPLATES_DIR|~/Templates]/tmp, if it exists.
-h Show this help text -h Show this help text
@ -59,12 +59,16 @@ if [ -n "$1" ]; then
fi fi
unset userdirs unset userdirs
copydir="${XDG_TEMPLATES_DIR:-~/Templates}/tmp/$1" copydir="${XDG_TEMPLATES_DIR:-~/Templates}/tmp/$1"
if [ -d "$copydir" ]; then if ! [ -d "$copydir" ]; then
log "Using template \"$1\""
cp -r "$copydir"/* "$tmpdir"
else
log "Could not find template directory \"$copydir\"" log "Could not find template directory \"$copydir\""
exit 3
fi fi
if ! [ -r "$copydir" ]; then
log "Cannot read template directory \"$copydir\""
exit 4
fi
log "Using template \"$1\""
cp -r "$copydir"/* "$tmpdir"
unset copydir unset copydir
fi fi