3diy
/
3dscreen_installer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Свой git config pull.rebase false и правка путей

This commit is contained in:
Nikolay Kopitonenko 2024-02-16 13:48:57 +03:00
parent 4241e059c2
commit b8df6dbae0
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install
View File

@ -12,6 +12,8 @@ ConfigsHome=${MY_ConfigsHome:-$configsHome}
set -x set -x
git config pull.rebase false
[ -e "$ConfigsHome" ] && { [ -e "$ConfigsHome" ] && {
(cd "$ConfigsHome" \ (cd "$ConfigsHome" \
&& git pull \ && git pull \
@ -73,7 +75,7 @@ SCREEN_ARCHIVE=/home/pi/3dscreen.zip
[ -e /home/pi/3dscreen.settings.json ] || \ [ -e /home/pi/3dscreen.settings.json ] || \
install -m644 -o 0 -g 0 $ConfigsHome/home/pi/3dscreen.settings.json /home/pi/3dscreen.settings.json install -m644 -o 0 -g 0 $ConfigsHome/home/pi/3dscreen.settings.json /home/pi/3dscreen.settings.json
[ -e /home/pi/3dscreen.settings.json ] || \ [ -e /home/pi/3dscreen.custom.config.js ] || \
touch /home/pi/3dscreen.custom.config.js touch /home/pi/3dscreen.custom.config.js
$InstallHome/install_helper $InstallHome/install_helper