x1z53/ALR
1
0
Fork 0
forked from Plemya-x/ALR
Code Pull Requests Activity

chore: fix formatting

Browse Source
This commit is contained in:
Maxim Slipenko
2025-01-30 10:10:42 +03:00
parent 4463a32ae7
commit d201aae6e0
19 changed files with 253 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/config/lang.go
View File

@ -42,18 +42,19 @@ var (
// Subsequent calls will just return the same value.
func Language(ctx context.Context) language.Tag {
langMtx.Lock()
defer langMtx.Unlock()
if !langSet {
syslang := SystemLang()
tag, err := language.Parse(syslang)
if err != nil {
slog.Error(gotext.Get("Error parsing system language"), "err", err)
langMtx.Unlock()
os.Exit(1)
}
base, _ := tag.Base()
lang = language.Make(base.String())
langSet = true
}
langMtx.Unlock()
return lang
}

2
internal/config/paths.go
View File

@ -38,7 +38,7 @@ type Paths struct {
// using information from the system.
// Subsequent calls will return the same value.
//
// Depreacted: use struct API
// Deprecated: use struct API
func GetPaths(ctx context.Context) *Paths {
alrConfig := GetInstance(ctx)
return alrConfig.GetPaths(ctx)

7
internal/cpu/cpu.go
View File

@ -38,11 +38,12 @@ func armVariant() string {
return armEnv
}
if cpu.ARM.HasVFPv3 {
switch {
case cpu.ARM.HasVFPv3:
return "arm7"
} else if cpu.ARM.HasVFP {
case cpu.ARM.HasVFP:
return "arm6"
} else {
default:
return "arm5"
}
}

5
internal/db/db.go
View File

@ -129,7 +129,10 @@ func (d *Database) initDB(ctx context.Context) error {
ver, ok := d.GetVersion(ctx)
if ok && ver != CurrentVersion {
slog.Warn(gotext.Get("Database version mismatch; resetting"), "version", ver, "expected", CurrentVersion)
d.reset(ctx)
err = d.reset(ctx)
if err != nil {
return err
}
return d.initDB(ctx)
} else if !ok {
slog.Warn(gotext.Get("Database version does not exist. Run alr fix if something isn't working."), "version", ver, "expected", CurrentVersion)

8
internal/osutils/move.go
View File

@ -55,12 +55,12 @@ func copyDirOrFile(sourcePath, destPath string) error {
return err
}
if sourceInfo.IsDir() {
switch {
case sourceInfo.IsDir():
return copyDir(sourcePath, destPath, sourceInfo)
} else if sourceInfo.Mode().IsRegular() {
case sourceInfo.Mode().IsRegular():
return copyFile(sourcePath, destPath, sourceInfo)
} else {
// ignore non-regular files
default:
return nil
}
}

5
internal/shutils/helpers/helpers.go
View File

@ -245,10 +245,13 @@ func gitVersionCmd(hc interp.HandlerContext, cmd string, args []string) error {
return fmt.Errorf("git-version: %w", err)
}
commits.ForEach(func(*object.Commit) error {
err = commits.ForEach(func(*object.Commit) error {
revNum++
return nil
})
if err != nil {
return fmt.Errorf("git-version: %w", err)
}
HEAD, err := r.Head()
if err != nil {

26
internal/translations/default.pot
View File

@ -26,23 +26,23 @@ msgid ""
"Build package from scratch even if there's an already built package available"
msgstr ""
#: build.go:80
#: build.go:87
msgid "Error pulling repositories"
msgstr ""
#: build.go:87
#: build.go:95
msgid "Unable to detect a supported package manager on the system"
msgstr ""
#: build.go:98
#: build.go:107
msgid "Error building package"
msgstr ""
#: build.go:104
#: build.go:114
msgid "Error getting working directory"
msgstr ""
#: build.go:112
#: build.go:123
msgid "Error moving the package"
msgstr ""
@ -218,7 +218,7 @@ msgstr ""
msgid "Unable to create package cache directory"
msgstr ""
#: internal/config/lang.go:50
#: internal/config/lang.go:49
msgid "Error parsing system language"
msgstr ""
@ -226,7 +226,7 @@ msgstr ""
msgid "Database version mismatch; resetting"
msgstr ""
#: internal/db/db.go:135
#: internal/db/db.go:138
msgid ""
"Database version does not exist. Run alr fix if something isn't working."
msgstr ""
@ -347,27 +347,27 @@ msgstr ""
msgid "Executing build()"
msgstr ""
#: pkg/build/build.go:489
#: pkg/build/build.go:487
msgid "Executing package()"
msgstr ""
#: pkg/build/build.go:527
#: pkg/build/build.go:509
msgid "Executing files()"
msgstr ""
#: pkg/build/build.go:605
#: pkg/build/build.go:587
msgid "AutoProv is not implemented for this package format, so it's skipped"
msgstr ""
#: pkg/build/build.go:616
#: pkg/build/build.go:598
msgid "AutoReq is not implemented for this package format, so it's skipped"
msgstr ""
#: pkg/build/build.go:723
#: pkg/build/build.go:705
msgid "Would you like to remove the build dependencies?"
msgstr ""
#: pkg/build/build.go:829
#: pkg/build/build.go:811
msgid "The checksums array must be the same length as sources"
msgstr ""

26
internal/translations/po/ru/default.po
View File

@ -33,23 +33,23 @@ msgid ""
"Build package from scratch even if there's an already built package available"
msgstr "Создайте пакет с нуля, даже если уже имеется готовый пакет"
#: build.go:80
#: build.go:87
msgid "Error pulling repositories"
msgstr "Ошибка при извлечении репозиториев"
#: build.go:87
#: build.go:95
msgid "Unable to detect a supported package manager on the system"
msgstr "Не удалось обнаружить поддерживаемый менеджер пакетов в системе"
#: build.go:98
#: build.go:107
msgid "Error building package"
msgstr "Ошибка при сборке пакета"
#: build.go:104
#: build.go:114
msgid "Error getting working directory"
msgstr "Ошибка при получении рабочего каталога"
#: build.go:112
#: build.go:123
msgid "Error moving the package"
msgstr "Ошибка при перемещении пакета"
@ -229,7 +229,7 @@ msgstr "Не удалось создать каталог кэша репози
msgid "Unable to create package cache directory"
msgstr "Не удалось создать каталог кэша пакетов"
#: internal/config/lang.go:50
#: internal/config/lang.go:49
msgid "Error parsing system language"
msgstr "Ошибка при парсинге языка системы"
@ -237,7 +237,7 @@ msgstr "Ошибка при парсинге языка системы"
msgid "Database version mismatch; resetting"
msgstr "Несоответствие версий базы данных; сброс настроек"
#: internal/db/db.go:135
#: internal/db/db.go:138
msgid ""
"Database version does not exist. Run alr fix if something isn't working."
msgstr ""
@ -363,29 +363,29 @@ msgstr "Исполнение prepare()"
msgid "Executing build()"
msgstr "Исполнение build()"
#: pkg/build/build.go:489
#: pkg/build/build.go:487
msgid "Executing package()"
msgstr "Исполнение package()"
#: pkg/build/build.go:527
#: pkg/build/build.go:509
msgid "Executing files()"
msgstr "Исполнение files()"
#: pkg/build/build.go:605
#: pkg/build/build.go:587
msgid "AutoProv is not implemented for this package format, so it's skipped"
msgstr ""
"AutoProv не реализовано для этого формата пакета, поэтому будет пропущено"
#: pkg/build/build.go:616
#: pkg/build/build.go:598
msgid "AutoReq is not implemented for this package format, so it's skipped"
msgstr ""
"AutoReq не реализовано для этого формата пакета, поэтому будет пропущено"
#: pkg/build/build.go:723
#: pkg/build/build.go:705
msgid "Would you like to remove the build dependencies?"
msgstr "Хотели бы вы удалить зависимости сборки?"
#: pkg/build/build.go:829
#: pkg/build/build.go:811
msgid "The checksums array must be the same length as sources"
msgstr "Массив контрольных сумм должен быть той же длины, что и источники"