From fd3b28216424614e67be8ec3d946b9bd2b4bde54 Mon Sep 17 00:00:00 2001 From: SANO Masatoshi Date: Sat, 4 Sep 2021 13:30:36 +0900 Subject: [PATCH] use pacman for install-for-ci.sh --- scripts/install-for-ci.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/scripts/install-for-ci.sh b/scripts/install-for-ci.sh index c9e733c..d9393ac 100644 --- a/scripts/install-for-ci.sh +++ b/scripts/install-for-ci.sh @@ -135,14 +135,10 @@ install_roswell_bin () { if uname -s | grep -E "MSYS_NT|MINGW64|MINGW32" >/dev/null; then if [ $ROSWELL_BRANCH = release ]; then if [ "$ROSWELL_FORCE32" = "true" ];then - FILE=roswell-${ROSWELL_RELEASE_VERSION}-mingw32_nt-x86_64 + pacman -S mingw-w64-i686-roswell else - FILE=roswell-${ROSWELL_RELEASE_VERSION}-mingw64_nt-x86_64 + pacman -S $MINGW_PACKAGE_PREFIX-roswell fi - fetch "https://github.com/roswell/roswell/releases/download/v$ROSWELL_RELEASE_VERSION/$FILE.tar.bz2" /tmp/$FILE.tar.bz2 - extract -j /tmp/$FILE.tar.bz2 /tmp/roswell;make -C /tmp/roswell install - rm -rf /tmp/$FILE.tar.bz2 - rm -rf /tmp/roswell fi elif uname -s |grep Linux >/dev/null && uname -m |grep x86_64 >/dev/null; then if [ "$ROSWELL_INSTALL_DIR" = "/usr/local" ]; then