diff --git a/install.sh b/install.sh index be8739d..53037c2 100755 --- a/install.sh +++ b/install.sh @@ -55,21 +55,28 @@ install_go() { download_singularity() { if [ ! -f "$SINGULARITY_ARCHIVE" ]; then wget -O "$SINGULARITY_ARCHIVE" "$SINGULARITY_URL" - fi - if [ ! -d "$SINGULARITY_DIR" ]; then - echo "Creating directory: $SINGULARITY_DIR" - mkdir "$SINGULARITY_DIR" - echo "Extracting archive: $SINGULARITY_ARCHIVE to $SINGULARITY_DIR" - tar -xzf "$SINGULARITY_ARCHIVE" -C "$SINGULARITY_DIR" --strip-components=1 if [ $? -ne 0 ]; then - echo "Failed to extract $SINGULARITY_ARCHIVE" + echo "Failed to download $SINGULARITY_ARCHIVE" exit 1 fi - else - echo "$SINGULARITY_DIR already exists, skipping extraction." + fi + + if [ -d "$SINGULARITY_DIR" ]; then + echo "Removing existing directory: $SINGULARITY_DIR" + rm -rf "$SINGULARITY_DIR" + fi + + echo "Creating directory: $SINGULARITY_DIR" + mkdir "$SINGULARITY_DIR" + echo "Extracting archive: $SINGULARITY_ARCHIVE to $SINGULARITY_DIR" + tar -xzf "$SINGULARITY_ARCHIVE" -C "$SINGULARITY_DIR" --strip-components=1 + if [ $? -ne 0 ]; then + echo "Failed to extract $SINGULARITY_ARCHIVE" + exit 1 fi } + # 编译和安装 singularity compile_singularity() { cd "$SINGULARITY_DIR"