From 1979b697f396fcb0ddc133fbc8e6f2187d34ed9c Mon Sep 17 00:00:00 2001 From: Lea Date: Mon, 7 Jul 2025 17:31:43 +0200 Subject: [PATCH] More small bugfixes in the base64 enc/dec functions --- daisy.source | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/daisy.source b/daisy.source index bc354c6..77fe353 100755 --- a/daisy.source +++ b/daisy.source @@ -289,12 +289,11 @@ function daisy_enc() file_name=$(basename $1) fi - data=$(cat ${1:-/dev/stdin}) - base64_inner=$(echo -e "$data" | base64 | tr '\n' '-') + base64_inner=$(cat ${1:-/dev/stdin} | base64 | tr -d '\n') # Print out our block - printf "# File info: $file_info\n" - printf "daisy_data_base64_$file_name=\"$base64_inner\"" + echo -e "# File info: $file_info" + echo -e "daisy_data_base64_$file_name=\"$base64_inner\"" } # Will only take input files, always outputs to stdout @@ -313,9 +312,8 @@ function daisy_enc_multi() function daisy_dec() { - data=$(cat ${1:-/dev/stdin} | sed -e 's/.*=\"//g' | grep -v "#" | tr -d '\"' | tr -d "'" | tr '-' '\n' ) - decoded=$(echo -e "$data" | cut -d "=" -f 1 | base64 -d) - printf "$decoded" + data=$(cat ${1:-/dev/stdin} | grep -v "#" ) + echo -e "$data" | cut -d "=" -f 2 | cut -b 2- | head -c -1 | base64 -d } # Will only take a file and directory, sources it to find all encoded data