matze/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #706 from darko-poljak/SC2164

Browse source 
Fix SC2164
This commit is contained in:
Darko Poljak 2018-10-05 10:28:04 +02:00 committed by GitHub
commit 0cb127822f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cdist/conf/explorer/disks
View file

@ -1,3 +1,3 @@
#!/bin/sh #!/bin/sh
cd /dev cd /dev || exit 0
echo sd? hd? vd? echo sd? hd? vd?

4
cdist/conf/type/__link/explorer/state
View file

@ -32,7 +32,7 @@ destination_dir="${destination%/*}"
case "$type" in case "$type" in
symbolic) symbolic)
cd "$destination_dir" cd "$destination_dir" || exit 1
source_is=$(ls -l "$destination" | sed 's/.*-> //g') source_is=$(ls -l "$destination" | sed 's/.*-> //g')
if [ -h "$destination" ]; then if [ -h "$destination" ]; then
# ignore trailing slashes for comparison # ignore trailing slashes for comparison
@ -46,7 +46,7 @@ case "$type" in
fi fi
;; ;;
hard) hard)
cd "$destination_dir" cd "$destination_dir" || exit 1
# check source relative to destination_dir # check source relative to destination_dir
if [ ! -e "$source" ]; then if [ ! -e "$source" ]; then
echo sourcemissing echo sourcemissing