projects
/
carnet-tools-cn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r72: cp_backup_conffile je vracao false u slucaju da backup nije
[carnet-tools-cn.git]
/
functions.sh
diff --git
a/functions.sh
b/functions.sh
index
520007e
..
28877c5
100644
(file)
--- a/
functions.sh
+++ b/
functions.sh
@@
-173,11
+173,13
@@
cp_backup_conffile() {
did=1
fi
fi
did=1
fi
fi
-
- if [ "$check" -a "$did" ]; then
- return 0
- else
+
+ [ -z "$check" ] && return 0
+
+ if [ "$check" -a ! "$did" ]; then
return 3
return 3
+ else
+ return 0
fi
}
fi
}
@@
-192,7
+194,6
@@
cp_check_and_sed() {
[ "$CP_SCRIPT_DEBUG" ] && set -vx
local s sedcmd grepret ret i
if [ -z "$3" ]; then
[ "$CP_SCRIPT_DEBUG" ] && set -vx
local s sedcmd grepret ret i
if [ -z "$3" ]; then
- echo "Usage: cp_check_and_sed <regexp> <sed> <file> [file ...]" 2>&1
return 1
fi
s="$1"
return 1
fi
s="$1"
@@
-209,7
+210,7
@@
cp_check_and_sed() {
fi
[ -h "$i" ] && i=$(readlink -f "$i")
sed "$sedcmd" "$i" > "$i.dpkg-tmp"
fi
[ -h "$i" ] && i=$(readlink -f "$i")
sed "$sedcmd" "$i" > "$i.dpkg-tmp"
- if [ ! "$?" = "0" ]; then
+ if [ $? -ne 0 ]; then
rm "$i.dpkg-tmp"
echo "cp_check_and_sed: Problem with sed" 1>&2
return 5
rm "$i.dpkg-tmp"
echo "cp_check_and_sed: Problem with sed" 1>&2
return 5
@@
-221,7
+222,7
@@
cp_check_and_sed() {
fi
ret=0
done
fi
ret=0
done
- [ "$ret" -eq 2 -a "$grepret"] && ret=1 || true
+ [ "$ret" -eq 2 -a "$grepret" ] && ret=1 || true
return $ret
}
return $ret
}