nc-limits: fix units

nextcloud · Jun 24, 2018 · fe12ff9 · fe12ff9
1 parent bbb25fa
commit fe12ff9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,11 +1,13 @@
 
-[v0.57.12](https://github.com/nextcloud/nextcloudpi/commit/b0203ab) (2018-06-21) nc-limits: autolimits enhancements
+[v0.57.13](https://github.com/nextcloud/nextcloudpi/commit/2c9c790) (2018-06-24) nc-limits: fix units
+
+[v0.57.12](https://github.com/nextcloud/nextcloudpi/commit/79da40a) (2018-06-21) nc-limits: autolimits enhancements
 
 [v0.57.11](https://github.com/nextcloud/nextcloudpi/commit/038b260) (2018-06-20) letsencrypt: notify of renewals
 
 [v0.57.10](https://github.com/nextcloud/nextcloudpi/commit/88843ab) (2018-06-20) ncp-web: fix JS docker detection
 
-[v0.57.9](https://github.com/nextcloud/nextcloudpi/commit/ad64a4b) (2018-06-21) nc-format-USB: fix when ZRAM active
+[v0.57.9 ](https://github.com/nextcloud/nextcloudpi/commit/ad64a4b) (2018-06-21) nc-format-USB: fix when ZRAM active
 
 [v0.57.8 ](https://github.com/nextcloud/nextcloudpi/commit/e63523c) (2018-06-19) docker: adapt wizard
 

diff --git a/etc/ncp-config.d/nc-limits.sh b/etc/ncp-config.d/nc-limits.sh
@@ -19,7 +19,7 @@ INFO="Examples: 200M or 2G. Write 0 for autoconfig"
 configure()
 {
   # Set auto memory limit to 75% of the total memory
-  local TOTAL_MEM="$( free | sed -n 2p | awk '{ print $2 }' )"
+  local TOTAL_MEM="$( free -b | sed -n 2p | awk '{ print $2 }' )"
   AUTOMEM=$(( TOTAL_MEM * 75 / 100 ))
 
   # MAX FILESIZE

diff --git a/ncp-web/ncp-web.cfg b/ncp-web/ncp-web.cfg
@@ -1 +1 @@
-LANGUAGE_=[auto,en,de,_es_,zn]
+LANGUAGE_=[_auto_,en,de,es,zn]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		LANGUAGE_=[auto,en,de,_es_,zn]
		LANGUAGE_=[_auto_,en,de,es,zn]