X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=functions.sh;h=a818b344f13a56608a71a26a90612849f45c0dae;hb=01968242e3b13b6f0d59e35e612a824780927ab0;hp=73d69fca7a4f79693a6899a8468e537665268bee;hpb=bdb9172b3b081e91fe906a4bb43298054c3e5071;p=carnet-tools-cn.git

diff --git a/functions.sh b/functions.sh
index 73d69fc..a818b34 100644
--- a/functions.sh
+++ b/functions.sh
@@ -183,7 +183,7 @@ cp_check_and_sed() {
     [ -h "$i" ]        && i=$(readlink -f "$i")
     sed "$sedcmd" "$i" > "$i.dpkg-tmp"
     if ! cmp -s "$i" "$i.dpkg-tmp" 2>&1 >/dev/null; then
-      cp_safe_file_replace "$i.dpkg-tmp" "$i"
+      cp_mv "$i.dpkg-tmp" "$i"
     else
       rm "$i.dpkg-tmp"
     fi
@@ -253,3 +253,83 @@ cp_mv () {
   fi
   mv "$new" "$old"
 }
+# by ddzeko, Mon, 21 Mar 2005 13:35:42 +0100
+cp_yes_no () {
+  [ "$CP_SCRIPT_DEBUG" ] && set -vx
+  local prompt answer
+  prompt="$1"
+  [ "$prompt" ] || prompt="Are you sure?"
+  RET=""
+
+  # check to prevent user from using this when debconf is active
+  # (it would break communication with its backend - uses stdin/out)
+  if [ "$DEBCONF_REDIR" ]; then
+    echo "cp_yes_no: debconf redirection detected" >&2
+    return 1
+  fi
+
+  echo -n "$prompt (y)es/(n)o: "
+  read answer
+  case "$answer" in
+    y*)
+      echo
+      RET=y
+      ;;
+    n*)
+      echo
+      RET=n
+      ;;
+    *)
+      echo
+      echo "Please read the message and choose y or n"
+      cp_yes_no
+      ;;
+  esac
+}
+
+# by ddzeko, Tue, 29 Mar 2005 17:37:52 +0200
+#
+# db_get seems to return error messages if the requested variable 
+# is not found - we do not find that desirable, and checking $? with
+# set -e turned on seems to be a bit of a problem
+# --> that's why we wrap the db_get call to return unset RET variable
+#     instead of some gibberish error message that our script does
+#     not expect
+cp_db_get() {
+  local var
+  var="$1"
+  
+  # check to prevent user from using this before activating debconf
+  # confmodule needs to be loaded before accessing db_* functions
+  if [ -z "$DEBCONF_REDIR" ]; then
+    echo "cp_db_get: debconf not activated!" >&2
+    return 1
+  fi
+ 
+  if ! db_get "$var"; then
+    case "$RET" in
+        *doesn\'t\ exist)
+          RET=""
+          ;;
+        [0-9][0-9]\ ?*) # other errors
+          RET=""
+          ;;
+    esac
+  fi
+}
+
+# by ddzeko, Tue, 05 Apr 2005 15:47:37 +0200
+# - check is the script run by effective root
+cp_check_root() {
+  local euid
+  euid=`awk 'BEGIN{print PROCINFO["euid"]}'`
+  case "$euid" in
+    0)  RET=y  
+        return 0   ;;
+    ?*) RET=n
+        return 1   ;;
+    *)  RET=""
+        echo "cp_check_root: cannot determine euid" 2>&1 
+        ;;
+  esac
+}