small fixes
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -10,3 +10,4 @@
|
|||||||
/src/version.txt
|
/src/version.txt
|
||||||
/src/libs/shared/SH_version_gen.h
|
/src/libs/shared/SH_version_gen.h
|
||||||
/src/CMakeLists.txt.user*
|
/src/CMakeLists.txt.user*
|
||||||
|
*.autosave
|
||||||
|
|||||||
2
Jenkinsfile
vendored
2
Jenkinsfile
vendored
@@ -1,6 +1,6 @@
|
|||||||
pipeline {
|
pipeline {
|
||||||
environment {
|
environment {
|
||||||
JOBS_COUNT = 2
|
JOBS_COUNT = 4
|
||||||
}
|
}
|
||||||
agent none
|
agent none
|
||||||
stages {
|
stages {
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ set_deploy_property(${PROJECT_NAME}
|
|||||||
ANDROID_KEY_PASSWORD "shspasswd1"
|
ANDROID_KEY_PASSWORD "shspasswd1"
|
||||||
ANDROID_KEY_ALIAS "pult remote"
|
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'")
|
set(ANDROID_GRADLE_DEPENDENCIES "compile'com.android.support:support-v4:25.3.1'")
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
set_deploy_property(${PROJECT_NAME} ICON "../icons/SHS_Pult_remote.icns")
|
set_deploy_property(${PROJECT_NAME} ICON "../icons/SHS_Pult_remote.icns")
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
en = First release with CI/CD
|
en = First Working release with CI/CD
|
||||||
|
|
||||||
ru = Первый выпуск с помощью CI/CD
|
ru = Первый Рабочий выпуск с помощью CI/CD
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ action=$1
|
|||||||
version=$2
|
version=$2
|
||||||
|
|
||||||
if [ "$action" = "install" ]; then
|
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
|
fi
|
||||||
#if [ "$action" = upgrade ] || [ "$action" = install ]
|
#if [ "$action" = upgrade ] || [ "$action" = install ]
|
||||||
#then
|
#then
|
||||||
|
|||||||
Reference in New Issue
Block a user