Skip to content

Commit fb7e76d

Browse files
committed
shellcheck & cleanup [ci skip]
1 parent 754e19b commit fb7e76d

File tree

7 files changed

+18
-19
lines changed

7 files changed

+18
-19
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
freefem-docker/ff++-compiled
2-
freefem-docker/freefem.tar.gz
1+
ff++-compiled
2+
freefem.tar.gz
33
build

.jenkins/build.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/bin/bash
22

3-
cd freefem-docker \
4-
&& chmod +x ./build.sh \
3+
chmod +x ./build.sh \
54
&& ./build.sh

.jenkins/clean.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
22

3-
sudo docker container stop $(sudo docker container ls -aq)
4-
sudo docker container rm $(sudo docker container ls -aq)
5-
sudo docker rmi $(sudo docker images -q)
3+
sudo docker container stop "$(sudo docker container ls -aq)"
4+
sudo docker container rm "$(sudo docker container ls -aq)"
5+
sudo docker rmi "$(sudo docker images -q)"

.jenkins/deploy.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ FILE_NAME='freefem.tar.gz'
1818

1919
# Get the current release number from sources
2020
SOURCE_REPOSITORY='FreeFem-sources'
21-
CURRENT_VERSION=`curl 'https://api.github.com/repos/'$ORGANIZATION'/'$SOURCE_REPOSITORY'/releases/latest' | jq -r '.tag_name'`
21+
CURRENT_VERSION=$(curl "https://api.github.com/repos/$ORGANIZATION/$SOURCE_REPOSITORY/releases/latest" | jq -r '.tag_name')
2222

23-
echo 'Current FreeFEM version: '$CURRENT_VERSION
23+
echo "Current FreeFEM version: $CURRENT_VERSION"
2424

2525
# Create the release (keep the upload url)
26-
RELEASE_PARAMETERS=$(printf '{"tag_name": "%s", "target_commitish": "master", "name": "%s", "body": "FreeFEM docker - FreeFEM %s.", "draft": false, "prerelease": false}' $CURRENT_VERSION $CURRENT_VERSION $CURRENT_VERSION)
27-
RELEASE=`curl -H "Authorization: token $TOKEN" --data "$RELEASE_PARAMETERS" 'https://api.github.com/repos/'$ORGANIZATION'/'$REPOSITORY'/releases'`
28-
UPLOAD_URL=`echo $RELEASE | jq -r '.upload_url'`
29-
echo 'Upload URL: '$UPLOAD_URL
26+
RELEASE_PARAMETERS=$(printf '{"tag_name": "%s", "target_commitish": "master", "name": "%s", "body": "FreeFEM docker - FreeFEM %s.", "draft": false, "prerelease": false}' "$CURRENT_VERSION" "$CURRENT_VERSION" "$CURRENT_VERSION")
27+
RELEASE=$(curl -H "Authorization: token $TOKEN" --data "$RELEASE_PARAMETERS" "https://api.github.com/repos/$ORGANIZATION/$REPOSITORY/releases")
28+
UPLOAD_URL=$(echo "$RELEASE" | jq -r '.upload_url')
29+
echo "Upload URL: $UPLOAD_URL"
3030

3131
# Upload asset
32-
RESPONSE=`curl --data-binary "@$FILE_NAME" -H "Authorization: token $TOKEN" -H "Content-Type: application/octet-stream" "$UPLOAD_URL=$FILE_NAME"`
33-
echo 'Server response: '$RESPONSE
32+
RESPONSE=$(curl --data-binary "@$FILE_NAME" -H "Authorization: token $TOKEN" -H "Content-Type: application/octet-stream" "$UPLOAD_URL=$FILE_NAME")
33+
echo "Server response: $RESPONSE"

.jenkins/deployDockerHub.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
#!/bin/bash
22

33
# Login
4-
docker login -u sgarnotel -p $DOCKER_TOKEN
4+
docker login -u sgarnotel -p "$DOCKER_TOKEN"
55

66
# Get the current release number from sources
77
ORGANIZATION='FreeFem'
88
SOURCE_REPOSITORY='FreeFem-sources'
9-
CURRENT_VERSION=`curl 'https://api.github.com/repos/'$ORGANIZATION'/'$SOURCE_REPOSITORY'/releases/latest' | jq -r '.tag_name'`
9+
CURRENT_VERSION=$(curl "https://api.github.com/repos/$ORGANIZATION/$SOURCE_REPOSITORY/releases/latest" | jq -r '.tag_name')
1010

1111
# Tag
1212
docker tag freefem:latest freefem/freefem:latest
13-
docker tag freefem:latest freefem/freefem:$CURRENT_VERSION
13+
docker tag freefem:latest freefem/freefem:"$CURRENT_VERSION"
1414

1515
# Push
1616
docker push freefem/freefem:latest
17-
docker push freefem/freefem:$CURRENT_VERSION
17+
docker push freefem/freefem:"$CURRENT_VERSION"
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)