Свой git config pull.rebase false и правка путей
This commit is contained in:
parent
4241e059c2
commit
b8df6dbae0
4
install
4
install
|
@ -12,6 +12,8 @@ ConfigsHome=${MY_ConfigsHome:-$configsHome}
|
|||
|
||||
set -x
|
||||
|
||||
git config pull.rebase false
|
||||
|
||||
[ -e "$ConfigsHome" ] && {
|
||||
(cd "$ConfigsHome" \
|
||||
&& git pull \
|
||||
|
@ -73,7 +75,7 @@ SCREEN_ARCHIVE=/home/pi/3dscreen.zip
|
|||
[ -e /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
|
||||
|
||||
$InstallHome/install_helper
|
||||
|
|
Loading…
Reference in New Issue