From df9e40ab35ffbe72377603df0bb7557df8e4ad77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Sat, 26 Dec 2020 19:01:35 +0100
Subject: [PATCH] small updates to release.sh

- use git push --atomic
- update VM name
- rename (git|pypi)-upload
---
 scripts/release.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/scripts/release.sh b/scripts/release.sh
index a869b6bc..d8c3bd31 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -66,7 +66,7 @@ build-windows() {
 
     # build windows exe in vm
     ln -fs "${ROOTDIR}" /tmp/
-    vmstart "Windows 7" &
+    vmstart "windows7_x86_sp1" &
     disown
     while [ ! -e "gallery-dl.exe" ] ; do
         sleep 5
@@ -107,18 +107,17 @@ supportedsites() {
     fi
 }
 
-git-upload() {
+upload-git() {
     cd "${ROOTDIR}"
     echo Pushing changes to github
 
     git add "gallery_dl/version.py" "${README}" "${CHANGELOG}"
     git commit -S -m "release version ${NEWVERSION}"
     git tag -s -m "version ${NEWVERSION}" "v${NEWVERSION}"
-    git push
-    git push origin "v${NEWVERSION}"
+    git push --atomic origin master "v${NEWVERSION}"
 }
 
-pypi-upload() {
+upload-pypi() {
     cd "${ROOTDIR}/dist"
     echo Uploading to PyPI
 
@@ -156,6 +155,6 @@ build-python
 build-linux
 build-windows
 sign
-git-upload
-pypi-upload
+upload-git
+upload-pypi
 update-dev