From 2bde31c2fa5ceaf830d44e425c5639d64bb46cdd Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Thu, 14 Jul 2016 19:59:05 +0200
Subject: [PATCH] Expose safe_sed to satellites

---
 astronaut/astronaut | 11 ++++++-----
 astronaut/hello.sat |  4 ++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/astronaut/astronaut b/astronaut/astronaut
index 7a20240..0080eee 100755
--- a/astronaut/astronaut
+++ b/astronaut/astronaut
@@ -135,7 +135,7 @@ _mksum() {
     echo "$(md5sum "$@" 2> /dev/null | cut -d' ' -f1)"
 }
 
-_safe_sed() {
+safe_sed() {
     echo "$1" | sed 's/[[\.*^$/]/\\&/g'
 }
 
@@ -151,7 +151,7 @@ download() {
         _msg "Downloading $filename"
 
         [ "$3" ] && local cmd="$3" || local cmd="$cmd_download"
-        eval $(echo "$cmd" | sed -e "s@{dst}@'$(_safe_sed "$path")'@g" -e "s@{src}@'$(_safe_sed "$1")'@g")
+        eval $(echo "$cmd" | sed -e "s/{dst}/'$(safe_sed "$path")'/g" -e "s@{src}@'$(safe_sed "$1")'@g")
 
         checksum="$(_mksum "$path")"
         if [ "$2" -a "$checksum" != "$2" ]; then
@@ -165,7 +165,7 @@ extract() {
     _msg "Extracting $1"
     [ "$2" ] && local dest="$2" || local dest='.'
     [ "$3" ] && local cmd="$3" || local cmd="$cmd_extract"
-    eval $(echo "$cmd" | sed -e "s@{src}@'$dir_source/$name/$1'@g" -e "s@{dst}@'$dest'@g")
+    eval $(echo "$cmd" | sed -e "s/{src}/'$(safe_sed "$dir_source/$name/$1")'/g" -e "s/{dst}/'$(safe_sed "$dest")'/g")
 }
 
 getfile() {
@@ -206,7 +206,8 @@ option() {
 
     local enabled=false
     local opt
-    local IFS=','; for option in $options; do
+    local IFS=','
+    for option in $options; do
         local option_negate=false
         case "$option" in
             *=*)
@@ -301,7 +302,7 @@ dir_source="$(realpath "$dir_source")"
 
 if [ "$_download_only" = false ]; then
     # Fix up the install path
-    dir_install="$(echo "$dir_install" | sed -e "s@{pkg}@$(_safe_sed "$satname")@g")"
+    dir_install="$(echo "$dir_install" | sed -e "s/{pkg}/$(safe_sed "$satname")/g")"
 
     # This variable can be set by a wrapper script in need to nuke the install dir.
     if [ "$_nuke_dir_install" = true -a ! -z "$dir_install" ]; then
diff --git a/astronaut/hello.sat b/astronaut/hello.sat
index 616539a..4b0568d 100644
--- a/astronaut/hello.sat
+++ b/astronaut/hello.sat
@@ -96,4 +96,8 @@ rm "$dir_install/$dir_prefix/share/info/dir"  # This file collides with some oth
 # Call the function we imported. For more info see the top of the file, and functions/say_hello.sh
 say_hello
 
+# Misc functions:
+#safe_sed 'oh/i/hope\i\canuse%&thisinsed'
+# Escapes all the necessary characters to be able to use it in a regular sed command
+
 # vim:set tabstop=4 shiftwidth=4 syntax=sh et: