remove the requirement to sort the dict file. It's creating conflicts in lot of PRs. And adding a check for duplicated entries

gilgamezh · gilgamezh · commit f806547fd411 · 2020-05-24T21:23:44.000+02:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -9,8 +9,3 @@ repos:
     hooks:
     -   id: pospell
         args: ['--personal-dict', 'dict', '--modified', '--language', 'es_ES', '--language', 'es_AR']
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.5.0
-    hooks:
-    -   id: file-contents-sorter
-        files: dict
diff --git a/.travis.yml b/.travis.yml
@@ -11,6 +11,7 @@ install:
 script:
   - powrap --check --quiet **/*.po
   - pospell -p dict -l es_AR -l es_ES **/*.po
+  - make dict_dups
   - make build
 branches:
   only:
diff --git a/Makefile b/Makefile
@@ -31,6 +31,7 @@ help:
 	@echo " spell        Check spelling"
 	@echo " wrap         Wrap all the PO files to a fixed column width"
 	@echo " progress     To compute current progression on the tutorial"
+	@echo " dict_dups	Check duplicated entries on the dict"
 	@echo ""
 
 
@@ -94,3 +95,17 @@ spell: venv
 .PHONY: wrap
 wrap: venv
 	$(VENV)/bin/powrap **/*.po
+
+.PHONY: dict_dups
+SHELL:=/bin/bash
+.ONESHELL:
+dict_dups:
+	if [[ $$(cat dict| sort | uniq -dc) ]]; then\
+		echo -e "\n\n\n ####################### \n\n\n"
+		echo "duplicated lines in the dict file"
+		uniq -dc dict
+		exit 1
+	else
+		echo "no duplicated lines"
+		exit 0
+	fi
