From: chaoskagami Date: Tue, 13 Sep 2016 18:20:35 +0000 (-0400) Subject: Merge branch 'master' into wip/plainconf X-Git-Tag: v0.3.0~6^2~1 X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=10da804495b4e5be5fb0da5ba28153d2843b24f6;p=corbenik%2Fcorbenik.git Merge branch 'master' into wip/plainconf --- 10da804495b4e5be5fb0da5ba28153d2843b24f6 diff --cc Makefile.am index 5a908d9,fd9f45c..c089b21 --- a/Makefile.am +++ b/Makefile.am @@@ -30,20 -29,20 +30,20 @@@ all-local cp contrib/*.vco out@bindir@ cat host/generate_localeemu.sh | sed "s|\@localedir\@|@localedir@|g" > out/generate_localeemu.sh chmod +x out/generate_localeemu.sh - echo "#!/bin/bash" > out/o3ds_firm.sh + echo "#!/bin/sh" > out/o3ds_firm.sh echo "wget http://nus.cdn.c.shop.nintendowifi.net/ccs/download/0004013800000002/00000052 -O .@libdir@/firmware/native" >> out/o3ds_firm.sh - echo "wget http://nus.cdn.c.shop.nintendowifi.net/ccs/download/0004013800000002/cetk -O .@datarootdir@/keys/native.cetk" >> out/o3ds_firm.sh + echo "wget http://nus.cdn.c.shop.nintendowifi.net/ccs/download/0004013800000002/cetk -O .@libdir@/firmware/native.cetk" >> out/o3ds_firm.sh echo "wget http://nus.cdn.c.shop.nintendowifi.net/ccs/download/0004013800000102/00000016 -O .@libdir@/firmware/twl" >> out/o3ds_firm.sh - echo "wget http://nus.cdn.c.shop.nintendowifi.net/ccs/download/0004013800000102/cetk -O .@datarootdir@/keys/twl.cetk" >> out/o3ds_firm.sh + echo "wget http://nus.cdn.c.shop.nintendowifi.net/ccs/download/0004013800000102/cetk -O .@libdir@/firmware/twl.cetk" >> out/o3ds_firm.sh echo "wget http://nus.cdn.c.shop.nintendowifi.net/ccs/download/0004013800000202/0000000B -O .@libdir@/firmware/agb" >> out/o3ds_firm.sh - echo "wget http://nus.cdn.c.shop.nintendowifi.net/ccs/download/0004013800000202/cetk -O .@datarootdir@/keys/agb.cetk" >> out/o3ds_firm.sh + echo "wget http://nus.cdn.c.shop.nintendowifi.net/ccs/download/0004013800000202/cetk -O .@libdir@/firmware/agb.cetk" >> out/o3ds_firm.sh - echo "#!/bin/bash" > out/n3ds_firm.sh + echo "#!/bin/sh" > out/n3ds_firm.sh echo "wget http://nus.cdn.c.shop.nintendowifi.net/ccs/download/0004013820000002/00000021 -O .@libdir@/firmware/native" >> out/n3ds_firm.sh - echo "wget http://nus.cdn.c.shop.nintendowifi.net/ccs/download/0004013820000002/cetk -O .@datarootdir@/keys/native.cetk" >> out/n3ds_firm.sh + echo "wget http://nus.cdn.c.shop.nintendowifi.net/ccs/download/0004013820000002/cetk -O .@libdir@/firmware/native.cetk" >> out/n3ds_firm.sh echo "wget http://nus.cdn.c.shop.nintendowifi.net/ccs/download/0004013820000102/00000000 -O .@libdir@/firmware/twl" >> out/n3ds_firm.sh - echo "wget http://nus.cdn.c.shop.nintendowifi.net/ccs/download/0004013820000102/cetk -O .@datarootdir@/keys/twl.cetk" >> out/n3ds_firm.sh + echo "wget http://nus.cdn.c.shop.nintendowifi.net/ccs/download/0004013820000102/cetk -O .@libdir@/firmware/twl.cetk" >> out/n3ds_firm.sh echo "wget http://nus.cdn.c.shop.nintendowifi.net/ccs/download/0004013820000202/00000000 -O .@libdir@/firmware/agb" >> out/n3ds_firm.sh - echo "wget http://nus.cdn.c.shop.nintendowifi.net/ccs/download/0004013820000202/cetk -O .@datarootdir@/keys/agb.cetk" >> out/n3ds_firm.sh + echo "wget http://nus.cdn.c.shop.nintendowifi.net/ccs/download/0004013820000202/cetk -O .@libdir@/firmware/agb.cetk" >> out/n3ds_firm.sh chmod 755 out/*.sh cp README.md LICENSE.txt out/