mars

commit 405bbd3c0ca4afce3a890ae6e4c59035cb05a033
parent 3d70bf6284996a5308b8f952cbeef37758ea4c3b
Author: parazyd <parazyd@dyne.org>
Date:   Fri, 17 Jun 2016 11:48:32 +0200

change orange to yellow; note about rsync

Diffstat:
M
README.md
 | 
2
++
M
mars.sh
 | 
12
++++++------

2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
@@ -16,6 +16,8 @@ the `exclude` array is an array of (php) files you don't want to be processed.
 
 the `rsync-exclude` file contains the list of things for rsync to ignore.
 
+sidenote: rsync goes over ssh by default, but is easily configurable
+
 ## usage
 after you've configured your `webtree`, you are ready to generate the website.
 there are only two steps:
diff --git a/mars.sh b/mars.sh
@@ -21,7 +21,7 @@
 source webtree
 
 generate() {
-	print ${fg[green]}"(*) generating your static pages..."
+	print "${fg[green]}(*) generating your static pages..."
 	for dir in $tree; do
 		pushd $dir
 
@@ -29,7 +29,7 @@ generate() {
 
 		for page in $pages; do
 			if [[ -n "${exclude[(r)$page]}" ]]; then
-				print ${fg[orange]}"(*) $page found in excludes, skipping..."
+				print "${fg[yellow]}(*) $page found in excludes, skipping..."
 			else
 				process-page
 			fi
@@ -40,7 +40,7 @@ generate() {
 }
 
 process-page() {
-	print ${fg[green]}"(*) processing $page..."
+	print "${fg[green]}(*) processing $page..."
 	name=${page[(ws:.:)1]}
 	php -f $page > $name.html \
 		&& print "$name.php    ->    $name.html [ ${fg[green]}OK${reset_color} ]" \
@@ -48,7 +48,7 @@ process-page() {
 }
 
 clean() {
-	print ${fg[green]}"(*) cleaning..."
+	print "${fg[green]}(*) cleaning..."
 	for dir in $tree; do
 		pushd $dir
 
@@ -56,7 +56,7 @@ clean() {
 
 		for page in $pages; do
 			if [[ -n "${exclude[(r)$page]}" ]]; then
-				print ${fg[orange]}"(*) $page found in excludes, skipping..."
+				print "${fg[yellow]}(*) $page found in excludes, skipping..."
 			else
 				name=${page[(ws:.:)1]}
 				printf "(*) "
@@ -69,7 +69,7 @@ clean() {
 }
 
 push() {
-	print ${fg[green]}"(*) rsyncing website..."
+	print "${fg[green]}(*) rsyncing website..."
 
 	rsync -P -e 'ssh' -avl --delete --stats --progress \
 		--exclude-from 'rsync-exclude' \