Release 0.7.1

ngld · Nov 28, 2017 · 79c1fc7 · 79c1fc7
2 parents a67b9fe + 1eb32a1
commit 79c1fc7
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 8 deletions.
diff --git a/html/templates/kn-page.vue b/html/templates/kn-page.vue
@@ -1,5 +1,6 @@
 <script>
 let next_tab = null;
+let first_load = true;
 
 export default {
     data: () => ({
@@ -104,6 +105,10 @@ export default {
                 this.tab = next_tab;
                 this.page = next_tab === 'develop' ? 'develop' : 'modlist';
                 next_tab = null;
+            } else if(first_load) {
+                first_load = false;
+                next_tab = mods.length === 0 ? 'explore' : 'home';
+                fs2mod.showTab(next_tab);
             }
         },
 

diff --git a/html/templates/kn-settings-page.vue b/html/templates/kn-settings-page.vue
@@ -47,7 +47,11 @@ export default {
         save() {
             this.fso.joystick_ff_strength = this.ff_enabled ? 100 : 0;
 
-            for(let set of ['base_path', 'max_downloads', 'use_raven', 'engine_stability', 'download_bandwidth']) {
+            if(this.knossos.base_path !== this.old_settings.knossos.base_path) {
+                fs2mod.setBasePath(this.knossos.base_path);
+            }
+
+            for(let set of ['max_downloads', 'use_raven', 'engine_stability', 'download_bandwidth']) {
                 if(this.knossos[set] != this.old_settings.knossos[set]) {
                     fs2mod.saveSetting(set, JSON.stringify(this.knossos[set]));
                 }

diff --git a/knossos/center.py b/knossos/center.py
@@ -24,7 +24,7 @@
 
 # The version should follow the http://semver.org guidelines.
 # Only remove the -dev tag if you're making a release!
-VERSION = '0.7.0'
+VERSION = '0.7.1'
 UPDATE_LINK = 'https://dev.tproxy.de/knossos'
 INNOEXTRACT_LINK = 'https://dev.tproxy.de/knossos/innoextract.txt'
 DEBUG = os.getenv('KN_DEBUG', '0').strip() == '1'

diff --git a/knossos/tasks.py b/knossos/tasks.py
@@ -377,12 +377,13 @@ def work1(self, mod):
             os.makedirs(modpath)
 
         amount = float(len(mfiles))
-        inst_mods = center.installed.query_all(mod.mid)
         copies = []
         pkg_folders = {}
 
         # query_all is a generator so the exception will be thrown when looping over the result
         try:
+            inst_mods = list(center.installed.query_all(mod.mid))
+
             for mv in inst_mods:
                 if mv.dev_mode:
                     pf = pkg_folders.setdefault(mv, {})

diff --git a/knossos/windows.py b/knossos/windows.py
@@ -143,7 +143,7 @@ def tr(self, *args):
 
 class HellWindow(Window):
     _tasks = None
-    _mod_filter = 'explore'
+    _mod_filter = 'home'
     _search_text = ''
     _updating_mods = None
     _init_done = False

diff --git a/releng/pypi/auto-build.sh b/releng/pypi/auto-build.sh
@@ -4,12 +4,14 @@ set -eo pipefail
 
 cd /build
 sudo chown packager .
-rsync -a --exclude=dist --exclude=build --exclude=packer --exclude=.vagrant src/ work/
-cd work
+rsync -a --exclude=releng --exclude=node_modules src/ work/
+cd src
 
 . releng/config/config.sh
 import_key
 
+cd ../work
+
 export QT_SELECT=5
 VERSION="$(python3 setup.py get_version)"
 

diff --git a/releng/ubuntu/auto-build.sh b/releng/ubuntu/auto-build.sh
@@ -23,7 +23,9 @@ fi
 cd ../../../../work
 
 export QT_SELECT=5
-VERSION="$(python3 setup.py get_version)"
+if [ -z "$VERSION" ]; then
+	VERSION="$(python3 setup.py get_version)"
+fi
 UBUNTU_VERSION="artful"
 
 rsync -au ../src/releng/ubuntu/cache/node_modules/ node_modules/
@@ -39,7 +41,9 @@ tar -xzf ../"knossos_$VERSION.orig.tar.gz"
 cp -a ../src/releng/ubuntu/debian .
 
 if [ "$RELEASE" = "y" ]; then
+	pushd /build/src > /dev/null
 	import_key
+	popd > /dev/null
 
 	for ubuntu in $UBUNTU_VERSIONS; do
 		cat > debian/changelog <<EOF

diff --git a/releng/ubuntu/build.sh b/releng/ubuntu/build.sh
@@ -3,4 +3,4 @@
 set -eo pipefail
 cd "$(dirname "$0")"
 
-exec docker run --rm -it -v"$(cd ../..; pwd)":/build/src -u packager -e RELEASE="${RELEASE:-n}" knossos-ubuntu-builder bash /build/src/releng/ubuntu/auto-build.sh
+exec docker run --rm -it -v"$(cd ../..; pwd)":/build/src -u packager -e RELEASE="${RELEASE:-n}" -e VERSION="$VERSION" knossos-ubuntu-builder bash /build/src/releng/ubuntu/auto-build.sh