Commit 70ceb6cf authored by Maarten de Waard's avatar Maarten de Waard 👼
Browse files

Merge branch 'master' into 5-write-readme-file

parents d29973a4 98c3c57a
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
/ramdisk
/build/bin/cryptops-api
/build/usr/bin/cryptops-client
/build/etc/cryptops-api/version.txt
/build/etc/cryptops-client/version.txt
/deploy.sh
/build/usr/bin/jq
/crypt-initrd-extra-files/usr/bin/cryptops-api
/crypt-initrd-extra-files/usr/bin/cryptops-client
/crypt-initrd-extra-files/etc/cryptops-api/version.txt
/crypt-initrd-extra-files/etc/cryptops-client/version.txt
/crypt-initrd-extra-files/usr/bin/jq
+6 −10
Original line number Diff line number Diff line
@@ -4,27 +4,23 @@ set -e

# Directory where this script is located.
scriptDir=$(dirname -- "$(readlink -f -- "$BASH_SOURCE")") 
buildDir="${scriptDir}/build"
initrdDir="${scriptDir}/crypt-initrd-extra-files"

# Copy api server binary to initrd build dir.
cp "${scriptDir}/cryptops/bin/cryptops-api" "${buildDir}/bin/cryptops-api"
cp "${scriptDir}/cryptops/bin/cryptops-api" "${initrdDir}/bin/cryptops-api"

# Store api server version information.
versionInfoFile="${buildDir}/etc/cryptops-api/version.txt"
versionInfoFile="${initrdDir}/etc/cryptops-api/version.txt"
cd "${scriptDir}/cryptops"
git rev-parse --abbrev-ref HEAD > "${versionInfoFile}"
git log -1 >> "${versionInfoFile}"

# Copy api client script and associated binaries to initrd build dir.
cp "${scriptDir}/cryptops/cryptops-client/cryptops-client" "${buildDir}/usr/bin/cryptops-client"
cp "${scriptDir}/cryptops/cryptops-client/local/jq" "${buildDir}/usr/bin/jq"
cp "${scriptDir}/cryptops/cryptops-client/cryptops-client" "${initrdDir}/usr/bin/cryptops-client"
cp "${scriptDir}/cryptops/cryptops-client/local/jq" "${initrdDir}/usr/bin/jq"

# Store client version information.
versionInfoFile="${buildDir}/etc/cryptops-client/version.txt"
versionInfoFile="${initrdDir}/etc/cryptops-client/version.txt"
cd "${scriptDir}/cryptops/cryptops-client"
git rev-parse --abbrev-ref HEAD > "${versionInfoFile}"
git log -1 >> "${versionInfoFile}"

cd "${buildDir}"
find . | cpio -H newc -o | gzip -  > "${scriptDir}/ramdisk"
cd "${scriptDir}"

build/bin/[

deleted100755 → 0
−625 KiB

File deleted.

build/bin/[[

deleted100755 → 0
−625 KiB

File deleted.

build/bin/ar

deleted100755 → 0
−625 KiB

File deleted.

Loading