small fixes

2020-05-21 13:13:28 +03:00
parent 5f33aeb2de
commit f17c907eba
5 changed files with 6 additions and 5 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /src/version.txt
 /src/libs/shared/SH_version_gen.h
 /src/CMakeLists.txt.user*
+*.autosave
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 pipeline {
 	environment { 
-		JOBS_COUNT = 2
+		JOBS_COUNT = 4
 	}
 	agent none
    stages {
--- a/src/pult_remote/CMakeLists.txt
+++ b/src/pult_remote/CMakeLists.txt
@@ -13,7 +13,7 @@ set_deploy_property(${PROJECT_NAME}
 	ANDROID_KEY_PASSWORD "shspasswd1"
 	ANDROID_KEY_ALIAS "pult remote"
 	)
-set_lang(${PROJECT_NAME} ru)
+set_lang(${PROJECT_NAME} en ru)
 set(ANDROID_GRADLE_DEPENDENCIES "compile'com.android.support:support-v4:25.3.1'")
 if(APPLE)
 	set_deploy_property(${PROJECT_NAME} ICON "../icons/SHS_Pult_remote.icns")
--- a/src/pult_remote/whatsnew.properties
+++ b/src/pult_remote/whatsnew.properties
@@ -1,4 +1,4 @@
-en = First release with CI/CD
+en = First Working release with CI/CD

-ru = Первый выпуск с помощью CI/CD
+ru = Первый Рабочий выпуск с помощью CI/CD

--- a/src/server/debian-service/DEBIAN/preinst
+++ b/src/server/debian-service/DEBIAN/preinst
@@ -5,7 +5,7 @@ action=$1
 version=$2

 if [ "$action" = "install" ]; then
-	useradd --system --create-home --home-dir /var/lib/shs --shell /usr/sbin/nologin shs
+	useradd --system --create-home --home-dir /var/lib/shs --shell /usr/sbin/nologin --groups gpio,dialout shs
 fi
 #if [ "$action" = upgrade ] || [ "$action" = install ]
 #then