diff --git a/install b/install index 740b059..8152e30 100755 --- a/install +++ b/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