External-Mirrors/nextcloudpi
2
0
Fork 0
mirror of https://github.com/nextcloud/nextcloudpi.git synced 2026-01-10 15:12:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

build: make sure we dont deactivate the wizard accidentally

Browse Source
This commit is contained in:
nachoparker 2018-09-29 08:24:03 -06:00
parent aa2b3baa91
commit 6b14527ab4
7 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
batch.sh
View File

@ -31,21 +31,26 @@ IMG="$( ls -1t tmp/*.img | head -1 )"
./build-SD-armbian.sh bananapi Bananapi
# Docker x86
make nextcloudpi-x86 && {
docker push ownyourbits/nextcloudpi-x86
docker push ownyourbits/nextcloud-x86
docker push ownyourbits/lamp-x86
docker push ownyourbits/debian-ncp-x86
}
make nextcloudpi-x86
# TODO test first
#&& {
#docker push ownyourbits/nextcloudpi-x86
#docker push ownyourbits/nextcloud-x86
#docker push ownyourbits/lamp-x86
#docker push ownyourbits/debian-ncp-x86
#}
# Docker armhf
cp -n /usr/bin/qemu-arm-static docker-armhf && \
make nextcloudpi-armhf && {
docker push ownyourbits/nextcloudpi-armhf
docker push ownyourbits/nextcloud-armhf
docker push ownyourbits/lamp-armhf
docker push ownyourbits/debian-ncp-armhf
}
make nextcloudpi-armhf
# TODO test first && {
#docker push ownyourbits/nextcloudpi-armhf
#docker push ownyourbits/nextcloud-armhf
#docker push ownyourbits/lamp-armhf
#docker push ownyourbits/debian-ncp-armhf
#}
rm -f docker-armhf/qemu-arm-static
# License

1
build-SD-armbian.sh
View File

@ -26,6 +26,7 @@ prepare_dirs # tmp cache output
# add NCP modifications
mkdir -p armbian/userpatches armbian/userpatches/overlay
rm -f ncp-web/{wizard.cfg,ncp-web.cfg}
cp armbian.sh armbian/userpatches/customize-image.sh
rsync -Aax --delete --exclude-from .gitignore --exclude *.img --exclude *.bz2 . armbian/userpatches/overlay/

3
build-SD-rpi.sh
View File

@ -27,6 +27,9 @@ download_raspbian "$IMG"
resize_image "$IMG" "$SIZE"
update_boot_uuid "$IMG" # PARTUUID has changed after resize
# make sure we don't accidentally disable first run wizard
rm -f ncp-web/{wizard.cfg,ncp-web.cfg}
## BUILD NCP
echo -e "\e[1m\n[ Build NCP ]\e[0m"

3
docker-armhf/nextcloudpi/Dockerfile
View File

@ -15,6 +15,9 @@ COPY docker-common /tmp/ncp-build/docker-common/
RUN \
# make sure we don't accidentally disable first run wizard
rm -f ncp-web/{wizard.cfg,ncp-web.cfg}; \
# mark as image build
touch /.ncp-image; \

3
docker/nextcloudpi/Dockerfile
View File

@ -15,6 +15,9 @@ COPY docker-common /tmp/ncp-build/docker-common/
RUN \
# make sure we don't accidentally disable first run wizard
rm -f ncp-web/{wizard.cfg,ncp-web.cfg}; \
# mark as image build
touch /.ncp-image; \

1
install.sh
View File

@ -51,7 +51,6 @@ install_script etc/ncp-config.d/nc-nextcloud.sh
activate_script etc/ncp-config.d/nc-nextcloud.sh
install_script ncp.sh
activate_script etc/ncp-config.d/nc-init.sh
[[ -f /.ncp-image ]] && install_script post-inst.sh
popd
echo "Done.

5
ncp-web/index.php
View File

@ -148,9 +148,6 @@ HTML;
<div class="icon-config"></div>
</div>
</div>
<?php
if ( file_exists( 'wizard' ) )
echo <<<HTML
<a href="wizard" title="{$l->__("NextCloudPi Wizard")}">
<div class="wizard-btn">
<div id="expand">
@ -158,8 +155,6 @@ HTML;
</div>
</div>
</a>
HTML;
?>
<a href="https://github.com/nextcloud/nextcloudpi/wiki" target="_blank" tabindex="1" title="<?php echo $l->__("NextCloudPi Wiki"); ?>">
<div id="nc-button">
<div id="expand">