The u_skins is a mod, not a modpack. Moved u_skins to the root and all updater stuff to the (new) updater directory

2016-09-05 21:02:53 +02:00 · 2016-09-05 21:02:53 +02:00 · 8aef2c19ba
parent be8fa19b68
commit 8aef2c19ba
23 changed files with 10 additions and 8 deletions
--- a/7
+++ b/7
@ -6,9 +6,10 @@ It downloads the skins from the Minetest skin database. (http://minetest.fensta.
 Requires latest unified_inventory from:
 https://github.com/minetest-technic/unified_inventory

-To download the latest skins you need to run:
- "./update_from_db.py" OR
- the win32.NET client
+To download the latest there are 3 tools available in "updater" folder:
+ "./update_skins_db.sh"    bash and jq required
+ "./update_from_db.py"     python3 required
+ "MT_skins_updater.exe .." windows or mono required. ".." is the path to u_skins folder

 Licenses:
 --------
--- a/u_skins/depends.txt
+++ b/u_skins/depends.txt
--- a/u_skins/init.lua
+++ b/u_skins/init.lua
--- a/u_skins/locale/de.txt
+++ b/u_skins/locale/de.txt
--- a/u_skins/locale/template.txt
+++ b/u_skins/locale/template.txt
--- a/u_skins/meta/character_1.txt
+++ b/u_skins/meta/character_1.txt
--- a/u_skins/meta/character_2.txt
+++ b/u_skins/meta/character_2.txt
--- a/u_skins/meta/placeholder.txt
+++ b/u_skins/meta/placeholder.txt
--- a/modpack.txt
+++ b/modpack.txt
--- a/u_skins/players.lua
+++ b/u_skins/players.lua
--- a/u_skins/skinlist.lua
+++ b/u_skins/skinlist.lua
--- a/u_skins/textures/character_1.png
+++ b/u_skins/textures/character_1.png
--- a/u_skins/textures/character_1_preview.png
+++ b/u_skins/textures/character_1_preview.png
--- a/u_skins/textures/character_2.png
+++ b/u_skins/textures/character_2.png
--- a/u_skins/textures/character_2_preview.png
+++ b/u_skins/textures/character_2_preview.png
--- a/u_skins/textures/inventory_plus_skins.png
+++ b/u_skins/textures/inventory_plus_skins.png
--- a/u_skins/textures/u_skins_button.png
+++ b/u_skins/textures/u_skins_button.png
--- a/u_skins/textures/ui_misc_form.png
+++ b/u_skins/textures/ui_misc_form.png
--- a/updater/MT_skins_updater.cs
+++ b/updater/MT_skins_updater.cs
--- a/updater/MT_skins_updater.exe
+++ b/updater/MT_skins_updater.exe
--- a/updater/Newtonsoft.Json.dll
+++ b/updater/Newtonsoft.Json.dll
--- a/updater/update_from_db.py
+++ b/updater/update_from_db.py
@ -10,8 +10,8 @@ def die(message,code=23):
 		raise SystemExit(code)

 server = "minetest.fensta.bplaced.net"
-skinsdir = "u_skins/textures/"
-metadir = "u_skins/meta/"
+skinsdir = "../textures/"
+metadir = "../meta/"
 curskin = 0
 curpage = 1
 pages = None
--- a/updater/update_skins_db.sh
+++ b/updater/update_skins_db.sh
@ -14,9 +14,10 @@ NUMPAGES="1"	# Number of pages. Default is 1 page
 PERPAGE="2000"  # Number of items per page. Default is 2000.
 JSONURL="http://minetest.fensta.bplaced.net/api/get.json.php?getlist&page=$NUMPAGES&outformat=base64&per_page=$PERPAGE"	# The URL to the database
 PREVIEWURL="http://minetest.fensta.bplaced.net/skins/1/"	# The url to the location of the previews.
-temp=$PWD/tmp			# Where the temp folder will be. Default is $PWD/tmp, which means that the tmp folder will be put in the current folder
-METADEST=$PWD/u_skins/meta		# This is the folder where the meta data will be saved
-TEXTUREDEST=$PWD/u_skins/textures	# This is the folder where the skins and the previews will be saved
+curpath="$(dirname $0)"		# all path are relative to this script place
+temp="$curpath"/tmp			# Where the temp folder will be. Default is $PWD/tmp, which means that the tmp folder will be put in the current folder
+METADEST="$curpath"/../meta		# This is the folder where the meta data will be saved
+TEXTUREDEST="$curpath"/../textures	# This is the folder where the skins and the previews will be saved


 # === Make a bunch of folders and download the db ===