New command create() for news script

- ZNEWSDIR check/create
- Create now adds to ZCHAIN
- git repo integration and updating for new articles
- fixes

1 files changed, 27 insertions, 8 deletions

diff --git a/news b/news
index aa14f87..7db0032 100755
--- a/news
+++ b/news
@@ -1,4 +1,18 @@
 #!/bin/bash
+ZNEWSDIR="$WORKDIR/news"
+echo $ZNEWSDIR
+if [ ! -d $ZNEWSDIR ]; then
+	mkdir $ZNEWSDIR
+	cd $ZNEWSDIR
+	git init
+	echo "News repository" > README
+	echo "Qmetc" >> README
+	git add README
+	git commit -m "Initiated news repository"
+	echo znewsdir created along with git repo
+else
+	echo znewsdir found
+fi
 create(){
 	export NEWS_FILE="$(date +%Y%m%d_%H%M%S)"
 	vi $NEWS_FILE
@@ -6,20 +20,21 @@ create(){
 	TITLE="$(head -n 1 $NEWS_FILE)"
 	TO_FILE=$NEWS_FILE-$(echo $TITLE | tr '[:upper:]' '[:lower:]' | sed -e 's/ /\_/g' )
 	IPFS_FILE=$(ipfs add -q $NEWS_FILE)
-	sed -e 's/Qm.*/'$IPFS_FILE'/' README
-	add $TO_FILE
-	mv $NEWS_FILE news/$TO_FILE
+	#sed -e 's/Qm.*/'$IPFS_FILE'/' README
+	add $NEWS_FILE
+	mv $NEWS_FILE $ZNEWSDIR/$TO_FILE
 	echo "Adding to git repo..."
-	git add news/$TO_FILE
-	git commit -m "Added $TO_FILE with $(head -n 1 news/$TO_FILE)"
+	cd $ZNEWSDIR
+	git add $TO_FILE
+	git commit -m "Added $TO_FILE with $(head -n 1 $ZNEWSDIR/$TO_FILE)"
 }
 index(){
-	FILES="$(ls -1 news)"
+	FILES="$(ls -1 $ZNEWSDIR)"
 	i=0
 	for FILE in $FILES
 	do
 		DATE=$(echo $FILE | cut -d - -f 1 | awk '{print $1}')
-		TITLE=$(head -n 1 news/$FILE)
+		TITLE=$(head -n 1 $ZNEWSDIR/$FILE)
 		echo $i \| $DATE \| $TITLE
 		let i+=1
 	done	
@@ -33,6 +48,7 @@ import(){
 	echo $1
 }
 add(){
+	echo $(pwd)
 	if [ -f $1 ]; then
 		FILE="$1"
 		echo "Adding news from " $FILE
@@ -53,7 +69,7 @@ add(){
 EOF
 	else echo "File $FILE doesn't exist";
 	fi
-	sh bin/pack_z_block "news/add" data	
+	sh pack_z_block "news/add" data
 }
 usage(){
 	echo "#TODO"
@@ -62,6 +78,8 @@ usage(){
 	echo "index		Prints an indexed table of your news files"
 	echo "import <file>	#TODO"
 	echo "add <file>	Creates a data file from the news file you point to"
+	echo "create		Vim is going to pop up, you will write and save your"
+        echo "                  newsletter and it's going to be saved"
 }
 title
 if [ ! -z $1 ]; then
@@ -70,6 +88,7 @@ if [ ! -z $1 ]; then
 		index) index;break;;
 		import) import $2; break;;
 		add) add $2; break;;
+		create) create; exit;;
 		* ) usage;;
 	esac
 else usage