Skip to content

Commit 19d7b54

Browse files
ggtrdggtrd
authored andcommitted
fix config file update process
1 parent 513d160 commit 19d7b54

File tree

1 file changed

+3
-13
lines changed

1 file changed

+3
-13
lines changed

bashpack.sh

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -245,22 +245,13 @@ file_systemd_timers=(
245245
"$file_systemd_update.timer"
246246
)
247247

248-
# # On the 1.2.0 version, configuration file has been renamed from "$NAME_LOWERCASE_config" "$NAME_LOWERCASE.conf"
249-
# if [[ $(compare_version_age_with_current "1.2.0") = "current_is_older" ]] || [[ $(compare_version_age_with_current "1.2.0") = "current_is_equal" ]]; then
250-
# export file_config=$NAME_LOWERCASE"_config"
251-
# else
252-
export file_config=$NAME_LOWERCASE".conf"
253-
# fi
254-
248+
export file_config=$NAME_LOWERCASE".conf"
255249
file_current_publication=$dir_config"/.current_publication"
256250

257-
258-
259-
260251
# Workaround that permit to download the stable release in case of first installation or installation from a version that didn't had the config file
261252
# (If the config file doesn't exist, it cannot detect the publication where it's supposed to be written)
262-
# Also,
263-
# - create a temp config file also permit to get new config file names in case of rename in new versions
253+
# Also:
254+
# - create a temp config file permit to get new config file names in case of rename in new versions
264255
# - "manually" declare the current publication in case of new config file has been renamed and the publication can't be detected
265256
if [ ! -f "$dir_config/$file_config" ]; then
266257
if [ -f $file_current_publication ]; then
@@ -292,7 +283,6 @@ export URL # Export URL to be usable on tests
292283

293284

294285

295-
296286
# Testing if currently in the cloned repository or in the installed CLI to get the wanted files for each situation.
297287
# This permit to test the CLI from the scripts directly and avoid having to release it at each test.
298288
if [[ $0 = "./$NAME_LOWERCASE.sh" ]] && [[ -d "commands" ]]; then

0 commit comments

Comments
 (0)