diff --git a/packager/obs/Makefile b/packager/obs/Makefile
index 46ee95c4..47b4f701 100644
--- a/packager/obs/Makefile
+++ b/packager/obs/Makefile
@@ -1,26 +1,26 @@
all:
perl -e 'exit $$ENV{YYYYMMDD} !~ /20/'
cd ../debian/ && make
- osc rm home\:tange/parallel/parallel_*.dsc || true
- cp ../debian/parallel_*.dsc ../debian/parallel_*.tar.gz home\:tange/parallel/
- cp `ls ../../parallel-2*.tar.bz2|grep -v latest|tail -n1` home\:tange/parallel/
- perl -i -pe '/Version:/ and s/20\d\d\d\d\d\d/$$ENV{YYYYMMDD}/g' home:tange/parallel/parallel.spec
+ osc rm home-tange/parallel/parallel_*.dsc || true
+ cp ../debian/parallel_*.dsc ../debian/parallel_*.tar.gz home-tange/parallel/
+ cp `ls ../../parallel-2*.tar.bz2|grep -v latest|tail -n1` home-tange/parallel/
+ perl -i -pe '/Version:/ and s/20\d\d\d\d\d\d/$$ENV{YYYYMMDD}/g' home-tange/parallel/parallel.spec
# Update sha256sum
- cd home:tange/parallel && s=`sha256sum parallel-*.tar.bz2|field 1` perl -i -pe 's/(sha256sums=..)\w+(..)/$$1$$ENV{s}$$2/' PKGBUILD
+ cd home-tange/parallel && s=`sha256sum parallel-*.tar.bz2|field 1` perl -i -pe 's/(sha256sums=..)\w+(..)/$$1$$ENV{s}$$2/' PKGBUILD
# Update version
- cd home:tange/parallel && perl -i -pe 's/pkgver=.*/pkgver=$$ENV{YYYYMMDD}/' PKGBUILD
- cd home\:tange/parallel/ && osc diff
- cd home\:tange/parallel/ && osc up
- cd home\:tange/parallel/ && parallel osc add ::: *.spec *.dsc *.tar.gz *.tar.bz2 && echo Src added OK || true
- cd home\:tange/parallel/ && osc ci -m "New release"
+ cd home-tange/parallel && perl -i -pe 's/pkgver=.*/pkgver=$$ENV{YYYYMMDD}/' PKGBUILD
+ cd home-tange/parallel/ && osc diff
+ cd home-tange/parallel/ && osc up
+ cd home-tange/parallel/ && parallel osc add ::: *.spec *.dsc *.tar.gz *.tar.bz2 && echo Src added OK || true
+ cd home-tange/parallel/ && osc ci -m "New release"
### Wait for "building" state to complete
echo '### Wait for "building" state'
- cd home\:tange/parallel/ && yes building | parallel -vj1 --delay 10 --halt now,success=1 'osc results|G -E {}'
+ cd home-tange/parallel/ && yes building | parallel -vj1 --delay 10 --halt now,success=1 'osc results|G -E {}'
echo '### Wait for "building" state to end'
echo '### Ignore RedHat_RHEL-6 and Univention_3.2 that are broken'
- cd home\:tange/parallel/ && yes building | parallel -vj1 --delay 10 --halt now,fail=1 'osc results|G -v RedHat_RHEL-6 -v Univention_3.2 -E {}' || true
+ cd home-tange/parallel/ && yes building | parallel -vj1 --delay 10 --halt now,fail=1 'osc results|G -v RedHat_RHEL-6 -v Univention_3.2 -E {}' || true
echo '### Wait for "finished" state of .deb'
- cd home\:tange/parallel/ && echo succeeded | parallel -vj1 --retries 30 --delay 10 --halt now,success=1 'osc results|G -E "(Debian|Ubuntu).*{}"'
+ cd home-tange/parallel/ && echo succeeded | parallel -vj1 --retries 30 --delay 10 --halt now,success=1 'osc results|G -E "(Debian|Ubuntu).*{}"'
echo '### Wait for "finished" state of .rpm'
- cd home\:tange/parallel/ && echo succeeded | parallel -vj1 --retries 30 --delay 10 --halt now,success=1 'osc results|G -E "(SUSE|SLE|Scientific|RHEL|Fedora|CentOS).*{}"'
+ cd home-tange/parallel/ && echo succeeded | parallel -vj1 --retries 30 --delay 10 --halt now,success=1 'osc results|G -E "(SUSE|SLE|Scientific|RHEL|Fedora|CentOS).*{}"'
diff --git a/packager/obs/home:tange/.osc/_apiurl b/packager/obs/home-tange/.osc/_apiurl
similarity index 100%
rename from packager/obs/home:tange/.osc/_apiurl
rename to packager/obs/home-tange/.osc/_apiurl
diff --git a/packager/obs/home:tange/.osc/_packages b/packager/obs/home-tange/.osc/_packages
similarity index 100%
rename from packager/obs/home:tange/.osc/_packages
rename to packager/obs/home-tange/.osc/_packages
diff --git a/packager/obs/home:tange/.osc/_project b/packager/obs/home-tange/.osc/_project
similarity index 100%
rename from packager/obs/home:tange/.osc/_project
rename to packager/obs/home-tange/.osc/_project
diff --git a/packager/obs/home:tange/parallel/.osc/_apiurl b/packager/obs/home-tange/parallel/.osc/_apiurl
similarity index 100%
rename from packager/obs/home:tange/parallel/.osc/_apiurl
rename to packager/obs/home-tange/parallel/.osc/_apiurl
diff --git a/packager/obs/home-tange/parallel/.osc/_files b/packager/obs/home-tange/parallel/.osc/_files
new file mode 100644
index 00000000..aa01fefa
--- /dev/null
+++ b/packager/obs/home-tange/parallel/.osc/_files
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/packager/obs/home:tange/parallel/.osc/_meta b/packager/obs/home-tange/parallel/.osc/_meta
similarity index 100%
rename from packager/obs/home:tange/parallel/.osc/_meta
rename to packager/obs/home-tange/parallel/.osc/_meta
diff --git a/packager/obs/home:tange/parallel/.osc/_osclib_version b/packager/obs/home-tange/parallel/.osc/_osclib_version
similarity index 100%
rename from packager/obs/home:tange/parallel/.osc/_osclib_version
rename to packager/obs/home-tange/parallel/.osc/_osclib_version
diff --git a/packager/obs/home:tange/parallel/.osc/_package b/packager/obs/home-tange/parallel/.osc/_package
similarity index 100%
rename from packager/obs/home:tange/parallel/.osc/_package
rename to packager/obs/home-tange/parallel/.osc/_package
diff --git a/packager/obs/home:tange/parallel/.osc/_project b/packager/obs/home-tange/parallel/.osc/_project
similarity index 100%
rename from packager/obs/home:tange/parallel/.osc/_project
rename to packager/obs/home-tange/parallel/.osc/_project
diff --git a/packager/obs/home:tange/parallel/.osc/parallel.spec b/packager/obs/home-tange/parallel/.osc/parallel.spec
similarity index 100%
rename from packager/obs/home:tange/parallel/.osc/parallel.spec
rename to packager/obs/home-tange/parallel/.osc/parallel.spec
diff --git a/packager/obs/home:tange/parallel/.osc/_files b/packager/obs/home:tange/parallel/.osc/_files
deleted file mode 100644
index 1602ebf7..00000000
--- a/packager/obs/home:tange/parallel/.osc/_files
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/testsuite/input-files/testdir.tar.bz2 b/testsuite/input-files/testdir.tar.bz2
new file mode 100644
index 00000000..e620961a
Binary files /dev/null and b/testsuite/input-files/testdir.tar.bz2 differ
diff --git "a/testsuite/input-files/testdir/ ab /c' d/ ef\"g" "b/testsuite/input-files/testdir/ ab /c' d/ ef\"g"
deleted file mode 100644
index 1505b408..00000000
--- "a/testsuite/input-files/testdir/ ab /c' d/ ef\"g"
+++ /dev/null
@@ -1 +0,0 @@
-efg
diff --git "a/testsuite/input-files/testdir/ ab/c\"d/ef g" "b/testsuite/input-files/testdir/ ab/c\"d/ef g"
deleted file mode 100644
index 1505b408..00000000
--- "a/testsuite/input-files/testdir/ ab/c\"d/ef g"
+++ /dev/null
@@ -1 +0,0 @@
-efg
diff --git "a/testsuite/input-files/testdir/ ab/c\"d/efg" "b/testsuite/input-files/testdir/ ab/c\"d/efg"
deleted file mode 100644
index 1505b408..00000000
--- "a/testsuite/input-files/testdir/ ab/c\"d/efg"
+++ /dev/null
@@ -1 +0,0 @@
-efg
diff --git a/testsuite/input-files/testdir/1-col.txt b/testsuite/input-files/testdir/1-col.txt
deleted file mode 100644
index 78981922..00000000
--- a/testsuite/input-files/testdir/1-col.txt
+++ /dev/null
@@ -1 +0,0 @@
-a
diff --git a/testsuite/input-files/testdir/2-col.txt b/testsuite/input-files/testdir/2-col.txt
deleted file mode 100644
index 34cdda44..00000000
--- a/testsuite/input-files/testdir/2-col.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-a b
-c d
-efg
-h i j
diff --git a/testsuite/input-files/testdir/a b/cd / ef/efg b/testsuite/input-files/testdir/a b/cd / ef/efg
deleted file mode 100644
index 1505b408..00000000
--- a/testsuite/input-files/testdir/a b/cd / ef/efg
+++ /dev/null
@@ -1 +0,0 @@
-efg
diff --git a/testsuite/input-files/testdir/a/bar b/testsuite/input-files/testdir/a/bar
deleted file mode 100644
index 5716ca59..00000000
--- a/testsuite/input-files/testdir/a/bar
+++ /dev/null
@@ -1 +0,0 @@
-bar
diff --git a/testsuite/input-files/testdir/a/foo b/testsuite/input-files/testdir/a/foo
deleted file mode 100644
index 257cc564..00000000
--- a/testsuite/input-files/testdir/a/foo
+++ /dev/null
@@ -1 +0,0 @@
-foo
diff --git a/testsuite/input-files/testdir/a/foo2 b/testsuite/input-files/testdir/a/foo2
deleted file mode 100644
index 257cc564..00000000
--- a/testsuite/input-files/testdir/a/foo2
+++ /dev/null
@@ -1 +0,0 @@
-foo
diff --git a/testsuite/input-files/testdir/b/bar b/testsuite/input-files/testdir/b/bar
deleted file mode 100644
index 5716ca59..00000000
--- a/testsuite/input-files/testdir/b/bar
+++ /dev/null
@@ -1 +0,0 @@
-bar
diff --git a/testsuite/input-files/testdir/b/foo b/testsuite/input-files/testdir/b/foo
deleted file mode 100644
index 257cc564..00000000
--- a/testsuite/input-files/testdir/b/foo
+++ /dev/null
@@ -1 +0,0 @@
-foo
diff --git a/testsuite/input-files/testdir2/1-col.txt b/testsuite/input-files/testdir2/1-col.txt
deleted file mode 100644
index 78981922..00000000
--- a/testsuite/input-files/testdir2/1-col.txt
+++ /dev/null
@@ -1 +0,0 @@
-a
diff --git a/testsuite/input-files/testdir2/2-col.txt b/testsuite/input-files/testdir2/2-col.txt
deleted file mode 100644
index 34cdda44..00000000
--- a/testsuite/input-files/testdir2/2-col.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-a b
-c d
-efg
-h i j
diff --git a/testsuite/input-files/testdir2/a/bar b/testsuite/input-files/testdir2/a/bar
deleted file mode 100644
index 5716ca59..00000000
--- a/testsuite/input-files/testdir2/a/bar
+++ /dev/null
@@ -1 +0,0 @@
-bar
diff --git a/testsuite/input-files/testdir2/a/foo b/testsuite/input-files/testdir2/a/foo
deleted file mode 100644
index 257cc564..00000000
--- a/testsuite/input-files/testdir2/a/foo
+++ /dev/null
@@ -1 +0,0 @@
-foo
diff --git a/testsuite/input-files/testdir2/a/foo2 b/testsuite/input-files/testdir2/a/foo2
deleted file mode 100644
index 257cc564..00000000
--- a/testsuite/input-files/testdir2/a/foo2
+++ /dev/null
@@ -1 +0,0 @@
-foo
diff --git a/testsuite/input-files/testdir2/b/bar b/testsuite/input-files/testdir2/b/bar
deleted file mode 100644
index 5716ca59..00000000
--- a/testsuite/input-files/testdir2/b/bar
+++ /dev/null
@@ -1 +0,0 @@
-bar
diff --git a/testsuite/input-files/testdir2/b/foo b/testsuite/input-files/testdir2/b/foo
deleted file mode 100644
index 257cc564..00000000
--- a/testsuite/input-files/testdir2/b/foo
+++ /dev/null
@@ -1 +0,0 @@
-foo
diff --git a/testsuite/input-files/testdir2/中国 (Zhōngguó)/China's (中国) road.jpg b/testsuite/input-files/testdir2/中国 (Zhōngguó)/China's (中国) road.jpg
deleted file mode 100644
index 26e6b63d..00000000
Binary files a/testsuite/input-files/testdir2/中国 (Zhōngguó)/China's (中国) road.jpg and /dev/null differ
diff --git a/testsuite/tests-to-run/parallel-local15.sh b/testsuite/tests-to-run/parallel-local15.sh
index 2d140b0f..c4ed9825 100755
--- a/testsuite/tests-to-run/parallel-local15.sh
+++ b/testsuite/tests-to-run/parallel-local15.sh
@@ -6,9 +6,10 @@
TMP=/run/shm/parallel_$$
-rsync -Ha --delete input-files/testdir/ $TMP/
+pwd=`pwd`
mkdir -p $TMP
cd $TMP/
+tar xjf "$pwd"/input-files/testdir.tar.bz2
echo echo test of cat pipe sh | parallel -j 50 2>&1
find . -name '*.jpg' | parallel -j +0 convert -geometry 120 {} {//}/thumb_{/}
diff --git a/testsuite/tests-to-run/parallel-local23.sh b/testsuite/tests-to-run/parallel-local23.sh
index 762dd757..0d4f42c1 100755
--- a/testsuite/tests-to-run/parallel-local23.sh
+++ b/testsuite/tests-to-run/parallel-local23.sh
@@ -4,9 +4,6 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
-rm -rf tmp 2>/dev/null
-cp -a input-files/testdir2 tmp
-
NICEPAR="nice nice parallel"
export NICEPAR
@@ -66,5 +63,3 @@ echo 'bug #43967: Error if there exists a bin/zsh or bin/bash dir (with zsh or b
EOF
-
-rm -rf tmp
diff --git a/testsuite/tests-to-run/test35.sh b/testsuite/tests-to-run/test35.sh
index ebeb6be6..1e30c651 100755
--- a/testsuite/tests-to-run/test35.sh
+++ b/testsuite/tests-to-run/test35.sh
@@ -7,9 +7,12 @@
SERVER1=parallel-server1
SSHUSER1=vagrant
SSHLOGIN1=$SSHUSER1@$SERVER1
-
-rsync -Ha --delete input-files/testdir/ tmp/
+
+mkdir -p tmp
cd tmp
+tar xjf ../input-files/testdir.tar.bz2
+#rsync -Ha --delete input-files/testdir/ tmp/
+#cd tmp
SERVER2=parallel@parallel-server2