Move scripts into directories

Dockerfile

@@ -30,6 +30,6 @@ RUN apt-get update && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* && \
     rm -f /var/log/*.log
-ENV PATH="/debimg:${PATH}"
+ENV PATH="/debimg/scripts:${PATH}"
 COPY . /debimg
 WORKDIR /debimg

dockerfiles/Dockerfile.arm32v7

@@ -25,6 +25,6 @@ RUN apt-get update && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* && \
     rm -f /var/log/*.log
-ENV PATH="/debimg:${PATH}"
+ENV PATH="/debimg/scripts:${PATH}"
 COPY . /debimg
 WORKDIR /debimg

dockerfiles/Dockerfile.arm32v7-on-amd64

@@ -36,6 +36,6 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/* && \
     rm -f /var/log/*.log
 RUN rm /usr/bin/qemu-arm-static
-ENV PATH="/debimg:${PATH}"
+ENV PATH="/debimg/scripts:${PATH}"
 COPY . /debimg
 WORKDIR /debimg

dockerfiles/Dockerfile.arm64v8

@@ -25,6 +25,6 @@ RUN apt-get update && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* && \
     rm -f /var/log/*.log
-ENV PATH="/debimg:${PATH}"
+ENV PATH="/debimg/scripts:${PATH}"
 COPY . /debimg
 WORKDIR /debimg

dockerfiles/Dockerfile.arm64v8-on-amd64

@@ -36,6 +36,6 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/* && \
     rm -f /var/log/*.log
 RUN rm /usr/bin/qemu-aarch64-static
-ENV PATH="/debimg:${PATH}"
+ENV PATH="/debimg/scripts:${PATH}"
 COPY . /debimg
 WORKDIR /debimg

scripts/build-debian

@@ -66,8 +66,8 @@ EOF
 	;;
 esac
 
-cp -rv --preserve=mode ../pre-2nd-stage-files/* debian
+cp -rv --preserve=mode ../2nd-stage-files/pre-2nd-stage-files/* debian
-cp -rv --preserve=mode ../pre-2nd-stage-files-${ARCH}/* debian
+cp -rv --preserve=mode ../2nd-stage-files/pre-2nd-stage-files-${ARCH}/* debian
 
 # Copy ARM emulation stuff
 cp -v /usr/bin/qemu-*-static debian/usr/bin || :
@@ -88,7 +88,7 @@ EOF
 # Remove ARM emulation stuff again
 rm -v debian/usr/bin/qemu-*-static || :
 
-cp -rv --preserve=mode ../post-2nd-stage-files/* debian
+cp -rv --preserve=mode ../2nd-stage-files/post-2nd-stage-files/* debian
 
 # List all files
 find debian ! -type d -printf "/%P\n" | sort > "/artifacts/debian-${DIST}-${ARCH}.files.txt"