Merge pull request #1 from spaceonfire/bundle_mp-iconv

WIP: some improvements for iconv
spaceonfire · Oct 30, 2018 · 183012b · 183012b
2 parents 747510a + ff5d24b
commit 183012b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/bin/bundle b/bin/bundle
@@ -9,4 +9,4 @@ if [ -e .bmfignore ]; then
 	ignore="-X .bmfignore"
 fi
 
-tar -czf $name ./* $ignore
+tar $ignore -czf $name ./*
diff --git a/bin/bundle_mp b/bin/bundle_mp
@@ -8,14 +8,19 @@ cp -r ./* .last_version
 chown -R 1000.1000 .last_version
 
 # Convert encoding for lang files
-find ./.last_version -name "*.php" -path "*lang*" -exec iconv -f utf-8 -t windows-1251 {} -o {} \;
+find ./.last_version -name "*.php" -path "*lang*" | while read i;
+do
+	echo $i
+	iconv -f utf-8 -t windows-1251 "$i" > tmp; \
+	mv tmp "$i";
+done
 
 if [ -e .bmfignore ]; then
 	ignore="-X .bmfignore"
 fi
 
 # Create bundle
-tar -czf .last_version.tar.gz .last_version $ignore
+tar $ignore -czf .last_version.tar.gz .last_version
 
 # Little clean up
 rm -rf .last_version