shijimasoft/cia-unix
1
Fork 0
mirror of https://github.com/shijimasoft/cia-unix.git synced 2025-06-18 14:25:34 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed ncch sorting issue and dependencies update

Browse Source
This commit is contained in:
shijimasoft 2024-05-08 14:55:03 +02:00
parent 12814d1ca4
commit 92dd95721d
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cia-unix.cr
View File

@ -121,7 +121,7 @@ Dir["*.cia"].each do |cia|
log.puts %x[python2.7 decrypt.py '#{cia}']
i : UInt8 = 0
Dir["*.ncch"].each do |ncch|
Dir["*.ncch"].sort.each do |ncch|
args += "-i '#{ncch}:#{i}:#{i}' "
i += 1
end

46
dltools.sh
View File

@ -5,63 +5,63 @@ BOLD=$(tput bold)
NORMAL=$(tput sgr0)
CTRTOOL_VER=1.2.0
MAKEROM_VER=0.18.3
MAKEROM_VER=0.18.4
# Darwin
if [[ "$OSTYPE" == "darwin"* ]]; then
# Apple Silicon
if [[ $(uname -m) == 'arm64' ]]; then
echo " * Downloading ${BOLD}ctrtool${NORMAL}"
wget https://github.com/3DSGuy/Project_CTR/releases/download/ctrtool-v$CTRTOOL_VER/ctrtool-v$CTRTOOL_VER-macos_arm64.zip -q
wget "https://github.com/3DSGuy/Project_CTR/releases/download/ctrtool-v${CTRTOOL_VER}/ctrtool-v${CTRTOOL_VER}-macos_arm64.zip" -q
echo " * Extracting ${BOLD}ctrtool${NORMAL}"
unzip -qq ctrtool-v$CTRTOOL_VER-macos_arm64.zip -d ctrtool-v$CTRTOOL_VER-macos_arm64
mv ctrtool-v$CTRTOOL_VER-macos_arm64/ctrtool "$SCRIPT_DIR/ctrtool"
unzip -qq "ctrtool-v${CTRTOOL_VER}-macos_arm64.zip" -d "ctrtool-v${CTRTOOL_VER}-macos_arm64"
mv "ctrtool-v${CTRTOOL_VER}-macos_arm64/ctrtool" "${SCRIPT_DIR}/ctrtool"
echo " * Downloading ${BOLD}makerom${NORMAL}"
wget https://github.com/3DSGuy/Project_CTR/releases/download/makerom-v$MAKEROM_VER/makerom-v$MAKEROM_VER-macos_arm64.zip -q
wget "https://github.com/3DSGuy/Project_CTR/releases/download/makerom-v${MAKEROM_VER}/makerom-v${MAKEROM_VER}-macos_arm64.zip" -q
echo " * Extracting ${BOLD}makerom${NORMAL}"
unzip -qq makerom-v$MAKEROM_VER-macos_arm64.zip -d makerom-v$MAKEROM_VER-macos_arm64
mv makerom-v$MAKEROM_VER-macos_arm64/makerom "$SCRIPT_DIR/makerom"
unzip -qq "makerom-v${MAKEROM_VER}-macos_arm64.zip" -d "makerom-v${MAKEROM_VER}-macos_arm64"
mv "makerom-v${MAKEROM_VER}-macos_arm64/makerom" "${SCRIPT_DIR}/makerom"
# x86_64
else
echo " * Downloading ${BOLD}ctrtool${NORMAL}"
wget https://github.com/3DSGuy/Project_CTR/releases/download/ctrtool-v$CTRTOOL_VER/ctrtool-v$CTRTOOL_VER-macos_x86_64.zip -q
wget "https://github.com/3DSGuy/Project_CTR/releases/download/ctrtool-v${CTRTOOL_VER}/ctrtool-v${CTRTOOL_VER}-macos_x86_64.zip" -q
echo " * Extracting ${BOLD}ctrtool${NORMAL}"
unzip -qq ctrtool-v$CTRTOOL_VER-macos_x86_64.zip -d ctrtool-v$CTRTOOL_VER-macos_x86_64
mv ctrtool-v$CTRTOOL_VER-macos_x86_64/ctrtool "$SCRIPT_DIR/ctrtool"
unzip -qq "ctrtool-v${CTRTOOL_VER}-macos_x86_64.zip" -d "ctrtool-v${CTRTOOL_VER}-macos_x86_64"
mv "ctrtool-v${CTRTOOL_VER}-macos_x86_64/ctrtool" "${SCRIPT_DIR}/ctrtool"
echo " * Downloading ${BOLD}makerom${NORMAL}"
wget https://github.com/3DSGuy/Project_CTR/releases/download/makerom-v$MAKEROM_VER/makerom-v$MAKEROM_VER-macos_x86_64.zip -q
wget "https://github.com/3DSGuy/Project_CTR/releases/download/makerom-v${MAKEROM_VER}/makerom-v${MAKEROM_VER}-macos_x86_64.zip" -q
echo " * Extracting ${BOLD}makerom${NORMAL}"
unzip -qq makerom-v$MAKEROM_VER-macos_x86_64.zip -d makerom-v$MAKEROM_VER-macos_x86_64
mv makerom-v$MAKEROM_VER-macos_x86_64/makerom "$SCRIPT_DIR/makerom"
unzip -qq "makerom-v${MAKEROM_VER}-macos_x86_64.zip" -d "makerom-v${MAKEROM_VER}-macos_x86_64"
mv "makerom-v${MAKEROM_VER}-macos_x86_64/makerom" "${SCRIPT_DIR}/makerom"
fi
# Linux (x86_64)
elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
echo " * Downloading ${BOLD}ctrtool${NORMAL}"
wget https://github.com/3DSGuy/Project_CTR/releases/download/ctrtool-v$CTRTOOL_VER/ctrtool-v$CTRTOOL_VER-ubuntu_x86_64.zip -q
wget "https://github.com/3DSGuy/Project_CTR/releases/download/ctrtool-v${CTRTOOL_VER}/ctrtool-v${CTRTOOL_VER}-ubuntu_x86_64.zip" -q
echo " * Extracting ${BOLD}ctrtool${NORMAL}"
unzip -qq ctrtool-v$CTRTOOL_VER-ubuntu_x86_64.zip -d ctrtool-v$CTRTOOL_VER-ubuntu_x86_64
mv ctrtool-v$CTRTOOL_VER-ubuntu_x86_64/ctrtool "$SCRIPT_DIR/ctrtool"
unzip -qq "ctrtool-v${CTRTOOL_VER}-ubuntu_x86_64.zip" -d "ctrtool-v${CTRTOOL_VER}-ubuntu_x86_64"
mv "ctrtool-v${CTRTOOL_VER}-ubuntu_x86_64/ctrtool" "${SCRIPT_DIR}/ctrtool"
echo " * Downloading ${BOLD}makerom${NORMAL}"
wget https://github.com/3DSGuy/Project_CTR/releases/download/makerom-v$MAKEROM_VER/makerom-v$MAKEROM_VER-ubuntu_x86_64.zip -q
wget "https://github.com/3DSGuy/Project_CTR/releases/download/makerom-v${MAKEROM_VER}/makerom-v${MAKEROM_VER}-ubuntu_x86_64.zip" -q
echo " * Extracting ${BOLD}makerom${NORMAL}"
unzip -qq makerom-v$MAKEROM_VER-ubuntu_x86_64.zip -d makerom-v$MAKEROM_VER-ubuntu_x86_64
mv makerom-v$MAKEROM_VER-ubuntu_x86_64/makerom "$SCRIPT_DIR/makerom"
unzip -qq "makerom-v${MAKEROM_VER}-ubuntu_x86_64.zip" -d "makerom-v${MAKEROM_VER}-ubuntu_x86_64"
mv "makerom-v${MAKEROM_VER}-ubuntu_x86_64/makerom" "${SCRIPT_DIR}/makerom"
fi
if [[ ! -f "decrypt.py" ]]; then
echo " * Downloading ${BOLD}decrypt.py${NORMAL}"
wget https://raw.githubusercontent.com/shijimasoft/cia-unix/main/decrypt.py -q
wget "https://raw.githubusercontent.com/shijimasoft/cia-unix/main/decrypt.py" -q
fi
if [[ ! -f "seeddb.bin" ]]; then
echo " * Downloading ${BOLD}seeddb.bin${NORMAL}"
wget https://github.com/ihaveamac/3DS-rom-tools/raw/master/seeddb/seeddb.bin -q
wget "https://github.com/ihaveamac/3DS-rom-tools/raw/master/seeddb/seeddb.bin" -q
fi
echo " * Cleaning up"
rm -rf ctrtool-v$CTRTOOL_VER-*
rm -rf makerom-v$MAKEROM_VER-*
rm -rf "ctrtool-v${CTRTOOL_VER}-"*
rm -rf "makerom-v${MAKEROM_VER}-"*
chmod +x ctrtool makerom