nc-restore: check btrfs command

nachoparker · nachoparker · commit 02efd614fd56 · 2019-04-29T19:57:40.000-06:00
diff --git a/bin/ncp/BACKUPS/nc-restore.sh b/bin/ncp/BACKUPS/nc-restore.sh
@@ -110,7 +110,7 @@ if [[ $( ls "$TMPDIR" | wc -l ) -eq $NUMFILES ]]; then
   echo "restore datadir to $DATADIR..."
   
   mkdir -p "$DATADIR"
-  [[ "$( stat -fc%T "$DATADIR" )" == "btrfs" ]] && {
+  [[ "$( stat -fc%T "$DATADIR" )" == "btrfs" ]] && which btrfs &>/dev/null && {
     rmdir "$DATADIR"                  || exit 1
     btrfs subvolume create "$DATADIR" || exit 1
   }
diff --git a/update.sh b/update.sh
@@ -170,6 +170,7 @@ EOF
 
   # update nc-backup
   install_app nc-backup
+  install_app nc-restore
 
   # create UPDATES section
   updates_dir=/usr/local/bin/ncp/UPDATES

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ if [[ $( ls "$TMPDIR" \| wc -l ) -eq $NUMFILES ]]; then`
`110`	`110`	`echo "restore datadir to $DATADIR..."`
`111`	`111`
`112`	`112`	`mkdir -p "$DATADIR"`
`113`		`- [[ "$( stat -fc%T "$DATADIR" )" == "btrfs" ]] && {`
	`113`	`+ [[ "$( stat -fc%T "$DATADIR" )" == "btrfs" ]] && which btrfs &>/dev/null && {`
`114`	`114`	`rmdir "$DATADIR" \|\| exit 1`
`115`	`115`	`btrfs subvolume create "$DATADIR" \|\| exit 1`
`116`	`116`	`}`