Merge pull request #254 from alichtman/cleanup_reinstall_clean

Avoid reinstalling img/ and README from dotfiles

Author: alichtman

README.md

@@ -88,24 +88,27 @@ Here's a `bash` script that I wrote to automate my dotfile backup workflow. You
 
 ```bash
 # Usage: backup-dots [COMMIT MESSAGE]
-function backup-dots() {
+backup-dots () {
 	echo "Backing up..."
+	crontab -l > ~/.config/crontab
 	(
-	shallow-backup -no_splash -dotfiles -separate_dotfiles_repo;
-	cd "$HOME/shallow-backup/dotfiles/" || exit
-	git add .
-
-	# If no commit message is provided, open vim.
-	# Otherwise, commit with the provided message
-	commit_msg="$1"
-	if [ -z "$commit_msg" ] ; then
-		git commit --verbose
-	else
-		git commit -m "$commit_msg"
-	fi
-	git push
+		shallow-backup -no_splash -dotfiles -separate_dotfiles_repo
+		cd "$HOME/shallow-backup/dotfiles/" || exit
+		hub stash
+		hub pull
+		hub stash pop
+		hub add .
+		commit_msg="$1" 
+		if [ -z "$commit_msg" ]
+		then
+			hub commit --verbose
+		else
+			hub commit -m "$commit_msg"
+		fi
+		hub push
 	)
 }
+
 ```
 
 ### What can I back up?

shallow_backup/utils.py

@@ -130,18 +130,20 @@ def destroy_backup_dir(backup_path):
 def get_abs_path_subfiles(directory):
 	"""
 	Returns list of absolute paths of files and folders contained in a directory,
-	excluding the root .git directory and root .gitignore..
+	excluding the .git directory, .gitignore, img/ and README.md in the root dir.
 	"""
 	file_paths = []
 	for path, _, files in os.walk(directory):
 		for name in files:
 			joined = os.path.join(path, name)
 			root_git_dir = os.path.join(directory, ".git")
 			root_gitignore = os.path.join(directory, ".gitignore")
-			if root_git_dir not in joined and root_gitignore not in joined:
+			img = os.path.join(directory, "img")
+			readme = os.path.join(directory, "readme.md")
+			if not any(root_git_dir, root_gitignore, img, readme) in joined:
 				file_paths.append(joined)
 			else:
-			    print(f"Excluded: {joined}")
+				print_path_red("Excluded:", joined)
 	return file_paths