merge from cgilite

[confetti] / categories / edit_categories.sh

diff --git a/actions/edit_categories.sh b/categories/edit_categories.sh
similarity index 72%
rename from actions/edit_categories.sh
rename to categories/edit_categories.sh
index 2c34d264d224e4d0ec65369eb5de4ddc3786dbb9..7ee6f36edffe91bb9d2c48feff824bccf90ebdb1 100755 (executable)
--- a/actions/edit_categories.sh
+++ b/categories/edit_categories.sh
@@ -19,13 +19,17 @@
 
 catfile="${_DATA}/mappings/categories"
 
 
 catfile="${_DATA}/mappings/categories"
 

-remove="${_POST[remove]}"
-newcat="${_POST[newcat]}"
+remove="$(POST remove)"
+newcat="$(POST newcat)"

 
 

-if [ "${_POST[add]}" = "add" ]; then
-  printf %s\\n "$newcat" >>"$catfile"
-elif [ -n "$remove" ]; then
-  sed -ri '/^'"${remove}"'$/d' $catfile
+if [ "$(POST add)" = "add" ]; then
+  categories="$( {
+    cat "$catfile"
+    printf %s\\n "$newcat"
+  } |sort -u )"
+  printf %s\\n "$categories" >"$catfile"
+elif [ "$remove" ]; then
+  sed -E -i '/^'"${remove}"'$/d' "$catfile"

 fi
 
 fi
 

-redirect "?p=categories"
+REDIRECT "/categories/"