1
0
mirror of https://github.com/pypiserver/pypiserver synced 2025-02-16 23:09:34 +01:00

Download git-new-workdir for STANDALONE.

+ Set exec-permissions in git.
+ FIX standalone-creation TC.
This commit is contained in:
Kostis Anagnostopoulos at STUW025 2015-09-14 16:14:50 +02:00
parent bd3612d79a
commit 88668ce8b0
3 changed files with 17 additions and 3 deletions

1
bin/.gitignore vendored Executable file

@ -0,0 +1 @@
/git-new-workdir

@ -7,10 +7,19 @@
my_dir="$(dirname "$0")"
cd $my_dir/..
git_wdir="./bin/git-new-workdir"
git_wdir_url="https://raw.githubusercontent.com/git/git/master/contrib/workdir/git-new-workdir"
if [ ! -x "$git_wdir" ]; then
wget "$git_wdir_url" -O "$git_wdir"
chmod a+x "$git_wdir"
fi
gitversion=$(git describe --tags)
rm -rf .standalone
if nwd_dump=$( git-new-workdir . .standalone standalone 2>&1 ); then
if nwd_dump=$( "$git_wdir" . .standalone standalone 2>&1 ); then
./bin/gen-standalone.py
chmod a+xr ./pypi-server-standalone.py
cp -p pypi-server-standalone.py .standalone
cd .standalone
if [ $# -lt 1 ]; then

@ -3,8 +3,12 @@
my_dir="$(dirname "$0")"
cd $my_dir/..
git fetch origin standalone:origin/standalone
git branch --track standalone origin/standalone
./bin/commit-standalone.sh no_commit
./pypi-server-standalone.py &
./pypi-server-standalone.py . &
server_pid=$!
sleep 2
kill $server_pid # Killing will fail if server had failed to start.
kill $server_pid # Killing fails if server failed starting-up.