diff --git a/README.md b/README.md index 604cf94..e72b949 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,6 @@ A collection of easy-to-understand, easy-to-use scripts and functions. Designed to be beginner-friendly but also useful! -# How to use -Simply open your shell's RC-file (.bashrc, .zshrc, etc) and include `source /daisy.source` preferably at the bottom of the file. We recommend setting your editor before sourcing `lackadaisical`. For instance, putting `export EDITOR=/usr/bin/nano` near thec\ top of your RC-file. It may later be overridden by `lackadaisical` itself if you use (or have used) `ched`. - -You can also try out the utilities by simply sourcing the file while running your shell. It will automatically include itself into your `PATH` variable. - # Contents *(taken from `daisy_help`)* 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