Merge branch 'jurism-5.0' of github.com:Juris-M/zotero into jurism-5.0

Juris-M · May 31, 2017 · b02c03c · b02c03c
2 parents 996ff61 + df2f97d
commit b02c03c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/build.sh b/build.sh
@@ -13,6 +13,15 @@ CLIENT="jurism"
 VERSION_ROOT="5.0m"
 SIGNED_STUB="juris_m-"
 
+set +e
+gfind --version > /dev/null 2<&1
+if [ $? -gt 0 ]; then
+    function gfind () {
+	find
+    }
+fi
+set -e
+
 function xx-remove-and-replace-old-build-dir () {
     rm -fR build
     for i in build build/styles build/translators; do
@@ -21,9 +30,9 @@ function xx-remove-and-replace-old-build-dir () {
 }
 
 function xx-save-aside-deleted-translators-list () {
-    if [ ${RELEASE} -gt 1 ]; then
+    #if [ ${RELEASE} -gt 1 ]; then
         cp translators/deleted.txt .
-    fi
+    #fi
 }
 
 function xx-copy-files-into-xpi () {

diff --git a/chrome/content/zotero/locale/csl b/chrome/content/zotero/locale/csl
diff --git a/styles b/styles
diff --git a/test/resource/chai b/test/resource/chai
diff --git a/test/resource/mocha b/test/resource/mocha