Skip to content

Commit 72bb39e

Browse files
dgibbs64dgibbs64
committed
fix: revert urls to correct data dir
1 parent 56e422b commit 72bb39e

7 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎.github/workflows/details-check-generate-matrix.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
curl "https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/${GITHUB_REF#refs/heads/}/${datadir}/serverlist.csv" | grep -v '^[[:blank:]]*$' > serverlist.csv
3+
curl "https://raw.githubusercontent.com/GameServerManagers/LinuxGSM/${GITHUB_REF#refs/heads/}/lgsm/data/serverlist.csv" | grep -v '^[[:blank:]]*$' > serverlist.csv
44

55
echo -n "{" > "shortnamearray.json"
66
echo -n "\"include\":[" >> "shortnamearray.json"

‎lgsm/modules/alert.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ fn_alert_info() {
198198
}
199199

200200
# Images
201-
alerticon="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${datadir}/gameicons/${shortname}-icon.png"
201+
alerticon="https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/gameicons/${shortname}-icon.png"
202202

203203
if [ "${alert}" == "permissions" ]; then
204204
fn_alert_permissions

‎lgsm/modules/alert_discord.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ jsoninfo=$(
1111
cat << EOF
1212
{
1313
"username": "LinuxGSM",
14-
"avatar_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${datadir}/alert_discord_logo.jpg",
14+
"avatar_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg",
1515
"file": "content",
1616
"embeds": [
1717
{
1818
"author": {
1919
"name": "LinuxGSM Alert",
2020
"url": "",
21-
"icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${datadir}/alert_discord_logo.jpg"
21+
"icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg"
2222
},
2323
"title": "${alerttitle}",
2424
"url": "",
@@ -64,7 +64,7 @@ jsoninfo=$(
6464
}
6565
],
6666
"footer": {
67-
"icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${datadir}/alert_discord_logo.jpg",
67+
"icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg",
6868
"text": "Sent by LinuxGSM ${version}"
6969
}
7070
}
@@ -77,14 +77,14 @@ jsonnoinfo=$(
7777
cat << EOF
7878
{
7979
"username": "LinuxGSM",
80-
"avatar_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${datadir}/alert_discord_logo.jpg",
80+
"avatar_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg",
8181
"file": "content",
8282
"embeds": [
8383
{
8484
"author": {
8585
"name": "LinuxGSM Alert",
8686
"url": "",
87-
"icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${datadir}/alert_discord_logo.jpg"
87+
"icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg"
8888
},
8989
"title": "${alerttitle}",
9090
"url": "",
@@ -125,7 +125,7 @@ jsonnoinfo=$(
125125
}
126126
],
127127
"footer": {
128-
"icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${datadir}/alert_discord_logo.jpg",
128+
"icon_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg",
129129
"text": "Sent by LinuxGSM ${version}"
130130
}
131131
}

‎lgsm/modules/alert_rocketchat.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jsoninfo=$(
1818
"color": "${alertcolourhex}",
1919
"author_name": "LinuxGSM Alert",
2020
"author_link": "https://linuxgsm.com",
21-
"author_icon": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${datadir}/alert_discord_logo.jpg",
21+
"author_icon": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg",
2222
"thumb_url": "${alerticon}",
2323
"text": "",
2424
"fields": [
@@ -75,7 +75,7 @@ jsonnoinfo=$(
7575
"color": "${alertcolourhex}",
7676
"author_name": "LinuxGSM Alert",
7777
"author_link": "https://linuxgsm.com",
78-
"author_icon": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${datadir}/alert_discord_logo.jpg",
78+
"author_icon": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg",
7979
"thumb_url": "${alerticon}",
8080
"text": "",
8181
"fields": [

‎lgsm/modules/alert_slack.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jsonnoinfo=$(
7070
"elements": [
7171
{
7272
"type": "image",
73-
"image_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${datadir}/alert_discord_logo.jpg",
73+
"image_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg",
7474
"alt_text": "LinuxGSM icon"
7575
},
7676
{
@@ -157,7 +157,7 @@ jsoninfo=$(
157157
"elements": [
158158
{
159159
"type": "image",
160-
"image_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${datadir}/alert_discord_logo.jpg",
160+
"image_url": "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/alert_discord_logo.jpg",
161161
"alt_text": "LinuxGSM icon"
162162
},
163163
{

‎lgsm/modules/check_deps.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,9 +358,9 @@ info_distro.sh
358358

359359
if [ ! -f "${tmpdir}/dependency-no-check.tmp" ] && [ ! -f "${datadir}/${distroid}-${distroversioncsv}.csv" ]; then
360360
# Check that the distro dependency csv file exists.
361-
fn_check_file_github "${datadir}" "${distroid}-${distroversioncsv}.csv"
361+
fn_check_file_github "lgsm/data" "${distroid}-${distroversioncsv}.csv"
362362
if [ -n "${checkflag}" ] && [ "${checkflag}" == "0" ]; then
363-
fn_fetch_file_github "${datadir}" "${distroid}-${distroversioncsv}.csv" "${datadir}" "chmodx" "norun" "noforce" "nohash"
363+
fn_fetch_file_github "lgsm/data" "${distroid}-${distroversioncsv}.csv" "${datadir}" "chmodx" "norun" "noforce" "nohash"
364364
fi
365365
fi
366366

‎lgsm/modules/command_update_linuxgsm.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,9 @@ if [ -f "${datadir}/${distroid}-${distroversioncsv}.csv" ]; then
160160
echo -en "checking ${remotereponame} config ${distroid}-${distroversioncsv}.csv...\c"
161161
fn_script_log_info "Checking ${remotereponame} ${distroid}-${distroversioncsv}.csv"
162162
if [ "${remotereponame}" == "GitHub" ]; then
163-
curl ${nocache} --connect-timeout 3 -IsfL "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${datadir}/${distroid}-${distroversioncsv}.csv" 1> /dev/null
163+
curl ${nocache} --connect-timeout 3 -IsfL "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/${distroid}-${distroversioncsv}.csv" 1> /dev/null
164164
else
165-
curl ${nocache} --connect-timeout 3 -IsfL "https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/${datadir}/${distroid}-${distroversioncsv}.csv" 1> /dev/null
165+
curl ${nocache} --connect-timeout 3 -IsfL "https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/lgsm/data/${distroid}-${distroversioncsv}.csv" 1> /dev/null
166166
fi
167167
if [ $? != "0" ]; then
168168
fn_print_fail_eol_nl
@@ -172,9 +172,9 @@ if [ -f "${datadir}/${distroid}-${distroversioncsv}.csv" ]; then
172172
fi
173173

174174
if [ "${remotereponame}" == "GitHub" ]; then
175-
config_file_diff=$(diff "${datadir}/${distroid}-${distroversioncsv}.csv" <(curl ${nocache} --connect-timeout 3 -s "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/${datadir}/${distroid}-${distroversioncsv}.csv"))
175+
config_file_diff=$(diff "${datadir}/${distroid}-${distroversioncsv}.csv" <(curl ${nocache} --connect-timeout 3 -s "https://raw.githubusercontent.com/${githubuser}/${githubrepo}/${githubbranch}/lgsm/data/${distroid}-${distroversioncsv}.csv"))
176176
else
177-
config_file_diff=$(diff "${datadir}/${distroid}-${distroversioncsv}.csv" <(curl ${nocache} --connect-timeout 3 -s "https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/${datadir}/${distroid}-${distroversioncsv}.csv"))
177+
config_file_diff=$(diff "${datadir}/${distroid}-${distroversioncsv}.csv" <(curl ${nocache} --connect-timeout 3 -s "https://bitbucket.org/${githubuser}/${githubrepo}/raw/${githubbranch}/lgsm/data/${distroid}-${distroversioncsv}.csv"))
178178
fi
179179

180180
if [ "${config_file_diff}" != "" ]; then

0 commit comments

Comments
 (0)