X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=cedit;h=1cfa5803c08cdb13945b8ae81fa882f747bcfc89;hb=refs%2Fheads%2Fmaster;hp=e6d373cde3907f5fb50663b23617f727525fe6e9;hpb=ea4ea4beebbe3d42e3016c8db246e8ad7d4aa20e;p=cedit

diff --git a/cedit b/cedit
index e6d373c..9e0b831 100755
--- a/cedit
+++ b/cedit
@@ -1,5 +1,12 @@
 #!/bin/bash
-# Copyright (C) 2016 Ian Kelling
+# I, Ian Kelling, follow the GNU license recommendations at
+# https://www.gnu.org/licenses/license-recommendations.en.html. They
+# recommend that small programs, < 300 lines, be licensed under the
+# Apache License 2.0. This file contains or is part of one or more small
+# programs. If a small program grows beyond 300 lines, I plan to switch
+# its license to GPL.
+
+# Copyright 2024 Ian Kelling
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,7 +22,7 @@
 
 cedit() {
   local help="Usage: [-h|--help ] [-v] [SECTION_NAME] FILE
-Create/modify a section in a config file
+Create/modify a comment-delimited section in a config file
 
 Returns 1 if the file is modified by this command, 2 or higher
 for other problems.
@@ -24,10 +31,11 @@ The section is #comment delimited. Reads STDIN for the contents of the
 section. Without SECTION_NAME, it acts on a global unnamed
 section. cedit is short for config edit.
 
--q         Quiet
+-b         Keep backup file
+-e         Exit 0 on modified file.
 -s         Silent. Quiet and exit 0 on modified file.
+-q         Quiet
 -v         Verbose
--b         Keep backup file
 -h|--help  Help"
   local s diff name init file_dir exists verbose backup quiet silent
   file_dir="$(dirname "$file")"
@@ -36,12 +44,14 @@ section. cedit is short for config edit.
   backup=false
   quiet=false
   silent=false
+  exit_status=true
 
   case $1 in
     -b) backup=true; shift ;;
-    -v) verbose=true; shift ;;
+    -e) exit_status=false; shift ;;
+    -s) quiet=true; silent=true; exit_status=false; shift ;;
     -q) quiet=true; shift ;;
-    -s) quiet=true; silent=true; shift ;;
+    -v) verbose=true; shift ;;
     -h|--help) echo "$help"; return ;;
   esac
 
@@ -53,8 +63,15 @@ section. cedit is short for config edit.
   local file="$1"
   local file_name="${file##*/}"
 
-  local begin="#_#_# start delimiter of cedit section$name. do not modify. #_#_#"
-  local end="#_#_# end delimiter of cedit section$name. do not modify. #_#_#"
+  local comment
+  comment="#_#_#"
+
+  # bind zone files use ; for comments yes, a little hacky detection.
+  if [[ $file_name == db.* ]]; then
+    comment=";;_;_;"
+  fi
+  local begin="$comment start delimiter of cedit section$name. do not modify. $comment"
+  local end="$comment end delimiter of cedit section$name. do not modify. $comment"
 
   if [[ ! -e $file_dir ]]; then
     if ! mkdir -p $file_dir; then
@@ -139,7 +156,7 @@ section. cedit is short for config edit.
   if ! $backup && $exists; then
     rm -r "$temp"
   fi
-  if $silent; then
+  if ! $exit_status; then
     case $ret in
       0|1) return 0 ;;
       *) return $ret ;;