chore: ran v fmt for v 0.3.3 changes
This commit is contained in:
parent
e10b450abd
commit
b3a119f221
37 changed files with 179 additions and 175 deletions
|
|
@ -3,14 +3,14 @@ module package
|
|||
// format_entry returns a string properly formatted to be added to a desc file.
|
||||
[inline]
|
||||
fn format_entry(key string, value string) string {
|
||||
return '\n%$key%\n$value\n'
|
||||
return '\n%${key}%\n${value}\n'
|
||||
}
|
||||
|
||||
// full_name returns the properly formatted name for the package, including
|
||||
// version & architecture
|
||||
pub fn (pkg &Pkg) full_name() string {
|
||||
p := pkg.info
|
||||
return '$p.name-$p.version-$p.arch'
|
||||
return '${p.name}-${p.version}-${p.arch}'
|
||||
}
|
||||
|
||||
// filename returns the correct filename of the package file
|
||||
|
|
@ -20,10 +20,10 @@ pub fn (pkg &Pkg) filename() string {
|
|||
1 { '.tar.gz' }
|
||||
6 { '.tar.xz' }
|
||||
14 { '.tar.zst' }
|
||||
else { panic("Another compression code shouldn't be possible. Faulty code: $pkg.compression") }
|
||||
else { panic("Another compression code shouldn't be possible. Faulty code: ${pkg.compression}") }
|
||||
}
|
||||
|
||||
return '${pkg.full_name()}.pkg$ext'
|
||||
return '${pkg.full_name()}.pkg${ext}'
|
||||
}
|
||||
|
||||
// to_desc returns a desc file valid string representation
|
||||
|
|
@ -31,7 +31,7 @@ pub fn (pkg &Pkg) to_desc() !string {
|
|||
p := pkg.info
|
||||
|
||||
// filename
|
||||
mut desc := '%FILENAME%\n$pkg.filename()\n'
|
||||
mut desc := '%FILENAME%\n${pkg.filename()}\n'
|
||||
|
||||
desc += format_entry('NAME', p.name)
|
||||
desc += format_entry('BASE', p.base)
|
||||
|
|
@ -94,10 +94,10 @@ pub fn (pkg &Pkg) to_desc() !string {
|
|||
desc += format_entry('CHECKDEPENDS', p.checkdepends.join_lines())
|
||||
}
|
||||
|
||||
return '$desc\n'
|
||||
return '${desc}\n'
|
||||
}
|
||||
|
||||
// to_files returns a files file valid string representation
|
||||
pub fn (pkg &Pkg) to_files() string {
|
||||
return '%FILES%\n$pkg.files.join_lines()\n'
|
||||
return '%FILES%\n${pkg.files.join_lines()}\n'
|
||||
}
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ fn parse_pkg_info_string(pkg_info_str &string) !PkgInfo {
|
|||
// NOTE: this command only supports zstd-, xz- & gzip-compressed tarballs.
|
||||
pub fn read_pkg_archive(pkg_path string) !Pkg {
|
||||
if !os.is_file(pkg_path) {
|
||||
return error("'$pkg_path' doesn't exist or isn't a file.")
|
||||
return error("'${pkg_path}' doesn't exist or isn't a file.")
|
||||
}
|
||||
|
||||
a := C.archive_read_new()
|
||||
|
|
|
|||
Reference in a new issue