Merge pull request #1 from ed-flanagan/master

It is wonderful outside, we are in the middle of the Steam Summer sale, and you are spending your time rewriting a bunch of code that I wrote as a one-off project 9 months ago that no one (including me) even uses?

ಠ_ಠ

Get it together Ed.

Author: jetpacktuxedo

README.md

@@ -0,0 +1,4 @@
+bingimg
+=======
+
+scrapes the bing image of the day in bash

archive/MTShasta.jpg

@@ -1,20 +1,67 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-cd ~/bingimg
+help_msg() {
+	echo "Usage: $0 [-h] [-a dir] [-d path] [-n name]"
+	echo "Options:"
+	echo "  -a <dir>   archive picture in given directory"
+	echo "  -d <path>  destination of picture (default's current directory)"
+	echo "  -h         display this message"
+	echo "  -n <name>  choose name for picture"
+}
 
-wget -q www.bing.com
-BINGPIC="$(cat index.html | grep g_img={url: | sed -e s/.*g_img={url:\'// | sed 's/\.jpg.*//')"
-ADDRESS="www.bing.com"
-ADDRESS+=$BINGPIC
-ADDRESS+=".jpg"
-#echo $ADDRESS
-wget -q $ADDRESS
+while getopts ":a:d:hn:" opt; do
+	case $opt in
+		a)
+			ARCHIVE=$OPTARG
+			if [[ ! $ARCHIVE =~ ^.*\/$ ]]; then
+				ARCHIVE=$ARCHIVE"/"
+			fi
+			if [ ! -d "$ARCHIVE" ]; then
+				echo "No such directory: $ARCHIVE"
+				exit 1
+			fi
+			;;
+		d)
+			DEST="$OPTARG"
+			if [[ ! $DEST =~ ^.*\/$ ]]; then
+				DEST=$DEST"/"
+			fi
+			if [ ! -d "$DEST" ]; then
+				echo "No such directory: $DEST"
+				exit 1
+			fi
+			;;
+		h)
+			help_msg
+			exit 0
+			;;
 
-FILE=$(echo $ADDRESS | cut -d '/' -f 5)
-DEST=$(echo $FILE | cut -d '_' -f 1)
-DEST+=".jpg"
+		n)
+			FILE=$OPTARG
+			;;
+		\?)
+			echo "Invalid option -$opt" >&2
+			help_msg
+			exit 1
+			;;
+		:)
+			echo "Option -$opt requires an argument" >&2
+			help_msg
+			exit 1
+			;;
+	esac
+done
 
-rm index.html
-mv $FILE archive/$DEST
+URL="www.bing.com"
+ADDRESS=$URL$(curl -s $URL | grep g_img={url: | sed -e s/.*g_img={url:\'// | sed 's/\.jpg.*//')".jpg"
+NAME=$(echo $ADDRESS | awk -F/ '{print $(NF)}' | cut -d _ -f 1)".jpg"
 
-cp archive/$DEST /var/www/bing.jpg
+curl -so $DEST$NAME $ADDRESS
+
+if [ -n "$ARCHIVE" ]; then
+	cp $DEST$NAME $ARCHIVE
+fi
+
+if [ -n "$FILE" ]; then
+	mv $DEST$NAME $DEST$FILE
+fi

archive/MagnificentTreeFrog.jpg

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+URL="www.bing.com"
+ADDRESS=$URL$(curl -s $URL | grep g_img={url: | sed -e s/.*g_img={url:\'// | sed 's/\.jpg.*//')".jpg"
+NAME=$(echo $ADDRESS | awk -F/ '{print $(NF)}' | cut -d _ -f 1)".jpg"
+
+curl -so archive/$NAME $ADDRESS
+
+cp archive/$NAME /var/www/bing.jpg