Commit f74538a6 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

Merge branch 'dev' into 'main' 

* merge dev with latest fixes

See merge request !3
parents 0230b39b bf485778

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ variables: 
  SITE_LOCATION: "updatesite/org.etsi.mts.tdl.extras.updatesite/target"

  ARCHIVE_NAME: "org.etsi.mts.tdl.extras.updatesite-1.0.0-SNAPSHOT.zip"

  SITE_ARCHIVE: "${SITE_LOCATION}/${ARCHIVE_NAME}"

  SITE_PATH: "${SITE_LOCATION}/repository/"

  SITE_PATH: "${SITE_LOCATION}/repository"

  REPO_PREFIX: "https://labs.etsi.org/rep/top/top-extras/-/jobs"

  REPO_PATH: "artifacts/raw/updatesite/org.etsi.mts.tdl.extras.updatesite/target/repository/"

  PACKAGE_NAME: "TOP Extras Interim Build"

prepare.sh

+4 −3
Original line number Diff line number Diff line
@@ -12,8 +12,9 @@ update_contents() { 
    CLEAN=$(echo "$TARGET_PATH/" | sed 's/\//\\\//g')

    echo $CLEAN

    # Use the escaped variable in a sed command

    echo "find . -type f | sed -e \"s|$CLEAN||g\" > \"$TARGET_PATH/content.txt\""

    echo "find $TARGET_PATH -type f | sed -e \"s|$CLEAN||g\" > \"$TARGET_PATH/content.txt\""

    find $TARGET_PATH -type f | sed -e "s|$CLEAN||g" > "$TARGET_PATH/content.txt"

    cat "$TARGET_PATH/content.txt"

}



process_contents() {
@@ -36,8 +37,8 @@ process_contents() { 
        mkdir -p `dirname "$line"`

        # get file

        curl "$BASE_URL/$channel/$line" -o "$channel/$line"

        # update contents

    done < "$file"

    # update contents

    update_contents $channel

    mkdir -p $RELEASE_BASE_PATH/$channel

    cp -r -f $channel/* $RELEASE_BASE_PATH/$channel
@@ -48,7 +49,7 @@ update_contents "$SITE_PATH" 


# process opposite channel

if [ "$TARGET_CHANNEL" == "beta" ]; then

    process_contents "main"

    process_contents "stable"

else

    process_contents "beta"

fi