Index: /trunk/Nebulous/bin/neb-shift
===================================================================
--- /trunk/Nebulous/bin/neb-shift	(revision 31963)
+++ /trunk/Nebulous/bin/neb-shift	(revision 31964)
@@ -29,7 +29,7 @@
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
-pod2usage( -msg => "Required options: --server <source key> <source volume>",
+pod2usage( -msg => "Required options: --server --volume <source key> <source volume>",
         -exitval => 2 )
-        unless defined $server and defined $src and defined $abandon_vol;
+        unless defined $server and defined $src and defined $abandon_vol and defined $volume;
 
 my $neb = Nebulous::Client->new(
@@ -45,12 +45,14 @@
 }
 
+my $all_uris = $neb->find_instances($src);
+
 my $status;
-if ($volume) {
-    $status = $neb->replicate( $src, $volume);
+$status = $neb->replicate( $src, $volume);
+die "Replicate phase failed for $src ($abandon_vol) ($volume)" unless $status;
+
+$uris = $neb->find_instances($src, "~$volume");
+unless (defined $uris) {
+    die "Replicate phase failed for $src ($abandon_vol) ($volume)";
 }
-else {
-    $status = $neb->replicate($src);
-}
-die "Replicate phase failed for $src ($abandon_vol) ($volume)" unless $status;
 
 $status = $neb->cull($src,$abandon_vol);