test

Author: nachoparker

bin/ncp/CONFIG/nc-datadir.sh

@@ -17,7 +17,7 @@ is_active()
 
 install()
 {
-  apt_install btrfs-tools
+  apt_install btrfs-progs
 }
 
 configure()

build/Vagrantfile

@@ -30,7 +30,7 @@ Vagrant.configure("2") do |config|
     sudo su
     set -e
     BRANCH=master
-    #BRANCH=devel  # uncomment to install devel
+    BRANCH=devel  # uncomment to install devel
     apt-get update
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends git ca-certificates
 

build/build-SD-rpi.sh

@@ -13,7 +13,7 @@ source build/buildlib.sh
 
 echo -e "\e[1m\n[ Build NCP Raspberry Pi ]\e[0m"
 
-URL="https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2021-11-08/2021-10-30-raspios-bullseye-arm64-lite.zip"
+URL="https://raspi.debian.net/tested/20210823_raspi_4_bullseye.img.xz"
 SIZE=4G                     # Raspbian image size
 #CLEAN=0                    # Pass this envvar to skip cleaning download cache
 IMG="NextCloudPi_RPi_$( date  "+%m-%d-%y" ).img"

build/buildlib.sh

@@ -273,8 +273,8 @@ function download_raspbian()
 {
   local URL=$1
   local IMGFILE=$2
-  local IMG_CACHE=cache/raspios_lite.img
-  local ZIP_CACHE=cache/raspios_lite.zip
+  local IMG_CACHE=cache/rpi_debian.img
+  local XZ_CACHE=cache/rpi_debian.img.xz
 
   echo -e "\n\e[1m[ Download RaspiOS ]\e[0m"
   mkdir -p cache
@@ -283,14 +283,13 @@ function download_raspbian()
     cp -v --reflink=auto $IMG_CACHE "$IMGFILE" && \
     return 0
 
-  test -f "$ZIP_CACHE" && {
-    echo -e "INFO: $ZIP_CACHE already exists. Skipping download ..."
+  test -f "$XZ_CACHE" && {
+    echo -e "INFO: $XZ_CACHE already exists. Skipping download ..."
   } || {
-    wget "$URL" -O "$ZIP_CACHE" || return 1
+    wget "$URL" -O "$XZ_CACHE" || return 1
   }
 
-  unzip -o "$ZIP_CACHE" && \
-    mv *-raspios-*.img $IMG_CACHE && \
+  unxz -c "$XZ_CACHE" > "$IMG_CACHE" && \
     cp -v --reflink=auto $IMG_CACHE "$IMGFILE" 
 }
 

lamp.sh

@@ -19,11 +19,14 @@
 # More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
 #
 
+source /usr/local/etc/library.sh # refresh NCPCFG RELEASE PHPVER
+
 APTINSTALL="apt-get install -y --no-install-recommends"
 export DEBIAN_FRONTEND=noninteractive
 
 install()
 {
+  set -x # TODO
     apt-get update
     $APTINSTALL apt-utils cron curl
     $APTINSTALL apache2