Merge 9c205b4fc8 into 9a3a10bf10

build.sh

@@ -253,7 +253,7 @@ for EXPORT_DIR in ${EXPORT_DIRS}; do
 	fi
 done
 
-if [ -x ${BASE_DIR}/postrun.sh ]; then
+if [ -x "${BASE_DIR}"/postrun.sh ]; then
 	log "Begin postrun.sh"
 	cd "${BASE_DIR}"
 	./postrun.sh

docker-compose.yml

@@ -1,3 +1,4 @@
+---
 version: '2'
 
 services:
@@ -5,6 +6,6 @@ services:
     restart: unless-stopped
     image: sameersbn/apt-cacher-ng:latest
     ports:
-    - "3142:3142"
+      - "3142:3142"
     volumes:
-    - ./apt-cacher-ng:/var/cache/apt-cacher-ng
+      - ./apt-cacher-ng:/var/cache/apt-cacher-ng

scripts/common

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 log (){
 	date +"[%T] $*" | tee -a "${LOG_FILE}"
 }

scripts/dependencies_check

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # dependencies_check
 # $@	Dependency files to check
 #

stage2/EXPORT_IMAGE

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 IMG_SUFFIX="-lite"
 if [ "${USE_QEMU}" = "1" ]; then
 	export IMG_SUFFIX="${IMG_SUFFIX}-qemu"

stage2/EXPORT_NOOBS

@@ -1,2 +1,5 @@
+#!/bin/bash
+
+# shellcheck disable=SC2034
 NOOBS_NAME="Raspbian Lite"
 NOOBS_DESCRIPTION="A port of Debian with no desktop environment"

stage4/EXPORT_IMAGE

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 IMG_SUFFIX=""
 if [ "${USE_QEMU}" = "1" ]; then
 	export IMG_SUFFIX="${IMG_SUFFIX}-qemu"

stage4/EXPORT_NOOBS

@@ -1,2 +1,5 @@
+#!/bin/bash
+
+# shellcheck disable=SC2034
 NOOBS_NAME="Raspbian"
 NOOBS_DESCRIPTION="A port of Debian with the Raspberry Pi Desktop"

stage5/EXPORT_IMAGE

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 IMG_SUFFIX="-full"
 if [ "${USE_QEMU}" = "1" ]; then
 	export IMG_SUFFIX="${IMG_SUFFIX}-qemu"

stage5/EXPORT_NOOBS

@@ -1,2 +1,5 @@
+#!/bin/bash
+
+# shellcheck disable=SC2034
 NOOBS_NAME="Raspbian Full"
 NOOBS_DESCRIPTION="A port of Debian with desktop and recommended applications"