diff options
author | Arne Jansen <sensille@gmx.net> | 2013-02-15 12:19:26 +0100 |
---|---|---|
committer | Arne Jansen <sensille@gmx.net> | 2013-02-15 12:19:26 +0100 |
commit | f4d8d57912e19340a7f7fc7ff2448ec89be0037e (patch) | |
tree | 69eedbb8d4988d7b46f05fd22c70c8c2e791a427 | |
parent | d6a4b1aed76350f3449215a1dfc8d6dd69fd429a (diff) | |
parent | a2cfc0320f3be6e16f7370025d5a80ff2a2aa22d (diff) | |
download | far-progs-f4d8d57912e19340a7f7fc7ff2448ec89be0037e.tar.gz |
Merge remote-tracking branch 'pizpot/master'
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | meta/057-replace-dir-dir.mac | 9 | ||||
-rw-r--r-- | meta/058-mv-dir-new-file.mac | 12 |
3 files changed, 22 insertions, 1 deletions
@@ -13,7 +13,7 @@ fardump: fardump.c fssum: fssum.c gcc -Wall $(CFLAGS) fssum.c -o fssum -lssl -lcrypto -actions: meta/*.mac +actions: meta meta/*.mac perl expand.pl -o actions -q meta/*.mac clean: diff --git a/meta/057-replace-dir-dir.mac b/meta/057-replace-dir-dir.mac new file mode 100644 index 0000000..0e226b1 --- /dev/null +++ b/meta/057-replace-dir-dir.mac @@ -0,0 +1,9 @@ +# replace a dir by a dir under the same name with content +mkdir $1 /1 +mkdir $2 /1/2 +snapshot + +rmdir /1/2 +mkdir $3 /1/2 +mkdir $4 /1/2/3 +snapshot diff --git a/meta/058-mv-dir-new-file.mac b/meta/058-mv-dir-new-file.mac new file mode 100644 index 0000000..8f00495 --- /dev/null +++ b/meta/058-mv-dir-new-file.mac @@ -0,0 +1,12 @@ +# move a dir to a different place and add a file to the dir +mkdir 1 /1 +mkdir $2 /1/2 +mkdir $3 /1/3 +mkdir $4 /1/2/4 +mkdir $5 /1/3/4 +snapshot + +rmdir /1/3/4 +mkfile $6 /1/2/4/6 +rename /1/2/4 /1/3/4 +snapshot |