From 18e0b56a980d4af0afb08199ee7c662b7d30080a Mon Sep 17 00:00:00 2001 From: "K.B.Dharun Krishna" Date: Mon, 29 Jan 2024 22:38:57 +0530 Subject: [PATCH] cleanup: update files Signed-off-by: K.B.Dharun Krishna --- .github/dependabot.yml | 10 ++ .github/workflows/go-pr.yml | 2 +- .gitignore | 2 +- COPYING.md | 2 +- ERROR_CODES.md | 1 + README.md | 3 +- VERSION | 2 +- cmd/config.go | 8 +- cmd/developer-program.go | 6 +- cmd/pico.go | 8 +- cmd/root.go | 9 ++ cmd/sys-upgrade.go | 8 +- cmd/tasks.go | 8 +- cmd/waydroid.go | 8 +- config/config.json | 2 +- core/fdroid.go | 9 ++ core/pico.go | 9 ++ core/task-checks.go | 8 +- core/task-struct.go | 8 +- core/tasks.go | 8 +- core/updater.go | 8 +- core/utils.go | 8 +- core/waydroid.go | 9 ++ debian/compat | 2 +- debian/copyright | 5 +- debian/gbp.conf | 2 +- main.go | 2 +- man/vso.1 | 105 +++++++++++++++++++- settings/config.go | 2 +- usr/bin/os-shell | 2 +- usr/share/vso/apx/package-managers/apt.yaml | 2 +- 31 files changed, 207 insertions(+), 61 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..fd7a33cb --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,10 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "monthly" + - package-ecosystem: "gomod" + directory: "/" + schedule: + interval: "weekly" diff --git a/.github/workflows/go-pr.yml b/.github/workflows/go-pr.yml index 232ac259..abf3681f 100644 --- a/.github/workflows/go-pr.yml +++ b/.github/workflows/go-pr.yml @@ -31,7 +31,7 @@ jobs: - name: Compress run: tar -czvf vso.tar.gz vso - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: vso path: vso.tar.gz diff --git a/.gitignore b/.gitignore index 8c95480b..ebcde191 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ /debian/vanilla-system-operator /debian/debhelper-build-stamp /debian/vanilla-system-operator.substvars -/vso \ No newline at end of file +/vso diff --git a/COPYING.md b/COPYING.md index eff7eb9e..f97a89ac 100644 --- a/COPYING.md +++ b/COPYING.md @@ -672,4 +672,4 @@ program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, -please read . \ No newline at end of file +please read . diff --git a/ERROR_CODES.md b/ERROR_CODES.md index 8cdc3b5f..6c09120b 100644 --- a/ERROR_CODES.md +++ b/ERROR_CODES.md @@ -1,3 +1,4 @@ # VSO Error Codes + - CMD_TR_UP_NOW: an error occurred during the forced update - CMD_TR_UP_NEED: an error occurred during the scheduled update diff --git a/README.md b/README.md index 74d39fe7..e5853454 100644 --- a/README.md +++ b/README.md @@ -46,9 +46,10 @@ Use "vso [command] --help" for more information about a command. ## Documentation -The official **documentation and manpage** for `vso` are available at . +The official **documentation and manpage** for `vso` are available at . ## VSO as system Shell + To use VSO as your system shell, you can copy the `usr/bin/vso-os-shell` script to your system's `/usr/bin` directory and set it as your default shell. Your image needs to implement the `usr/bin/os-shell` script, which will expand the diff --git a/VERSION b/VERSION index 359a5b95..227cea21 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0 \ No newline at end of file +2.0.0 diff --git a/cmd/config.go b/cmd/config.go index b72570e5..c5537816 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -3,10 +3,10 @@ package cmd /* License: GPLv3 Authors: Mirko Brombin - Vanilla OS Contributors - Copyright: 2023 - Description: VSO is a utility which allows you to perform maintenance - tasks on your Vanilla OS installation. + Pietro di Caprio + Copyright: 2024 + Description: The Vanilla System Operator is a package manager, + a system updater and a task automator. */ import ( diff --git a/cmd/developer-program.go b/cmd/developer-program.go index 33e3cc41..739d8343 100644 --- a/cmd/developer-program.go +++ b/cmd/developer-program.go @@ -4,9 +4,9 @@ package cmd Authors: Mirko Brombin Pietro di Caprio - Copyright: 2023 - Description: VSO is a utility which allows you to perform maintenance - tasks on your Vanilla OS installation. + Copyright: 2024 + Description: The Vanilla System Operator is a package manager, + a system updater and a task automator. */ import ( diff --git a/cmd/pico.go b/cmd/pico.go index cd03a1c4..fb763f2b 100644 --- a/cmd/pico.go +++ b/cmd/pico.go @@ -3,10 +3,10 @@ package cmd /* License: GPLv3 Authors: Mirko Brombin - Vanilla OS Contributors - Copyright: 2023 - Description: VSO is a utility which allows you to perform maintenance - tasks on your Vanilla OS installation. + Pietro di Caprio + Copyright: 2024 + Description: The Vanilla System Operator is a package manager, + a system updater and a task automator. */ import ( diff --git a/cmd/root.go b/cmd/root.go index 0a0f7a98..c76c4c1b 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -1,5 +1,14 @@ package cmd +/* License: GPLv3 + Authors: + Mirko Brombin + Pietro di Caprio + Copyright: 2024 + Description: The Vanilla System Operator is a package manager, + a system updater and a task automator. +*/ + import ( "embed" diff --git a/cmd/sys-upgrade.go b/cmd/sys-upgrade.go index 247e32b5..d16f09b4 100644 --- a/cmd/sys-upgrade.go +++ b/cmd/sys-upgrade.go @@ -3,10 +3,10 @@ package cmd /* License: GPLv3 Authors: Mirko Brombin - Vanilla OS Contributors - Copyright: 2023 - Description: VSO is a utility which allows you to perform maintenance - tasks on your Vanilla OS installation. + Pietro di Caprio + Copyright: 2024 + Description: The Vanilla System Operator is a package manager, + a system updater and a task automator. */ import ( diff --git a/cmd/tasks.go b/cmd/tasks.go index a89353aa..bd2d82f9 100644 --- a/cmd/tasks.go +++ b/cmd/tasks.go @@ -3,10 +3,10 @@ package cmd /* License: GPLv3 Authors: Mirko Brombin - Vanilla OS Contributors - Copyright: 2023 - Description: VSO is a utility which allows you to perform maintenance - tasks on your Vanilla OS installation. + Pietro di Caprio + Copyright: 2024 + Description: The Vanilla System Operator is a package manager, + a system updater and a task automator. */ import ( diff --git a/cmd/waydroid.go b/cmd/waydroid.go index f7d29370..a9c745b9 100644 --- a/cmd/waydroid.go +++ b/cmd/waydroid.go @@ -3,10 +3,10 @@ package cmd /* License: GPLv3 Authors: Mirko Brombin - Vanilla OS Contributors - Copyright: 2023 - Description: VSO is a utility which allows you to perform maintenance - tasks on your Vanilla OS installation. + Pietro di Caprio + Copyright: 2024 + Description: The Vanilla System Operator is a package manager, + a system updater and a task automator. */ import ( diff --git a/config/config.json b/config/config.json index 9e1e15a8..09826405 100644 --- a/config/config.json +++ b/config/config.json @@ -3,4 +3,4 @@ "schedule": "weekly", "smart": true } -} \ No newline at end of file +} diff --git a/core/fdroid.go b/core/fdroid.go index 68b22215..7a7bbe99 100644 --- a/core/fdroid.go +++ b/core/fdroid.go @@ -1,5 +1,14 @@ package core +/* License: GPLv3 + Authors: + Mirko Brombin + Pietro di Caprio + Copyright: 2024 + Description: The Vanilla System Operator is a package manager, + a system updater and a task automator. +*/ + import ( "fmt" "io" diff --git a/core/pico.go b/core/pico.go index 7b1a2e04..65911288 100644 --- a/core/pico.go +++ b/core/pico.go @@ -1,5 +1,14 @@ package core +/* License: GPLv3 + Authors: + Mirko Brombin + Pietro di Caprio + Copyright: 2024 + Description: The Vanilla System Operator is a package manager, + a system updater and a task automator. +*/ + import ( "github.com/vanilla-os/apx/v2/core" ) diff --git a/core/task-checks.go b/core/task-checks.go index 4c92ba06..ac4bfa9d 100644 --- a/core/task-checks.go +++ b/core/task-checks.go @@ -3,10 +3,10 @@ package core /* License: GPLv3 Authors: Mirko Brombin - Vanilla OS Contributors - Copyright: 2023 - Description: VSO is a utility which allows you to perform maintenance - tasks on your Vanilla OS installation. + Pietro di Caprio + Copyright: 2024 + Description: The Vanilla System Operator is a package manager, + a system updater and a task automator. */ import ( diff --git a/core/task-struct.go b/core/task-struct.go index aa4bbc29..c01e5406 100644 --- a/core/task-struct.go +++ b/core/task-struct.go @@ -3,10 +3,10 @@ package core /* License: GPLv3 Authors: Mirko Brombin - Vanilla OS Contributors - Copyright: 2023 - Description: VSO is a utility which allows you to perform maintenance - tasks on your Vanilla OS installation. + Pietro di Caprio + Copyright: 2024 + Description: The Vanilla System Operator is a package manager, + a system updater and a task automator. */ import ( diff --git a/core/tasks.go b/core/tasks.go index 2453fd68..ed3cdcf0 100644 --- a/core/tasks.go +++ b/core/tasks.go @@ -3,10 +3,10 @@ package core /* License: GPLv3 Authors: Mirko Brombin - Vanilla OS Contributors - Copyright: 2023 - Description: VSO is a utility which allows you to perform maintenance - tasks on your Vanilla OS installation. + Pietro di Caprio + Copyright: 2024 + Description: The Vanilla System Operator is a package manager, + a system updater and a task automator. */ import ( diff --git a/core/updater.go b/core/updater.go index e2ba6ac0..332037e6 100644 --- a/core/updater.go +++ b/core/updater.go @@ -3,10 +3,10 @@ package core /* License: GPLv3 Authors: Mirko Brombin - Vanilla OS Contributors - Copyright: 2023 - Description: VSO is a utility which allows you to perform maintenance - tasks on your Vanilla OS installation. + Pietro di Caprio + Copyright: 2024 + Description: The Vanilla System Operator is a package manager, + a system updater and a task automator. */ import ( diff --git a/core/utils.go b/core/utils.go index 0473fe4c..b36edbe5 100644 --- a/core/utils.go +++ b/core/utils.go @@ -3,10 +3,10 @@ package core /* License: GPLv3 Authors: Mirko Brombin - Vanilla OS Contributors - Copyright: 2023 - Description: VSO is a utility which allows you to perform maintenance - tasks on your Vanilla OS installation. + Pietro di Caprio + Copyright: 2024 + Description: The Vanilla System Operator is a package manager, + a system updater and a task automator. */ import ( diff --git a/core/waydroid.go b/core/waydroid.go index bb260bed..b84b83c2 100644 --- a/core/waydroid.go +++ b/core/waydroid.go @@ -1,5 +1,14 @@ package core +/* License: GPLv3 + Authors: + Mirko Brombin + Pietro di Caprio + Copyright: 2024 + Description: The Vanilla System Operator is a package manager, + a system updater and a task automator. +*/ + import ( "encoding/json" "fmt" diff --git a/debian/compat b/debian/compat index 3cacc0b9..48082f72 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -12 \ No newline at end of file +12 diff --git a/debian/copyright b/debian/copyright index a5762d67..851c5947 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Upstream-Name: Vanilla OS First Setup Source: https://github.com/vanilla-os/ Files: * -Copyright: 2023 Vanilla-OS contributors +Copyright: 2024 Vanilla-OS contributors License: GPL-3.0 License: GPL-3.0 @@ -20,4 +20,5 @@ License: GPL-3.0 along with this program. If not, see . . On Debian systems, the complete text of the GNU General - Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". \ No newline at end of file + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". + \ No newline at end of file diff --git a/debian/gbp.conf b/debian/gbp.conf index c8f95597..cec628c7 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,2 +1,2 @@ [DEFAULT] -pristine-tar = True \ No newline at end of file +pristine-tar = True diff --git a/main.go b/main.go index d128acd6..5bb04724 100644 --- a/main.go +++ b/main.go @@ -4,7 +4,7 @@ package main Authors: Mirko Brombin Pietro di Caprio - Copyright: 2023 + Copyright: 2024 Description: VSO is a utility which allows you to perform maintenance tasks on your Vanilla OS installation. */ diff --git a/man/vso.1 b/man/vso.1 index 1f0b5736..c1d3abde 100644 --- a/man/vso.1 +++ b/man/vso.1 @@ -1,4 +1,4 @@ -.TH VSO 1 "2023-08-24" "vso" "User Manual" +.TH VSO 1 "2024-01-29" "vso" "User Manual" .SH NAME .RS 4 vso - The Vanilla System Operator is a package manager, a system updater and a task automator\&. @@ -39,6 +39,11 @@ Install an application inside the subsystem Remove an application from the subsystem .PP .RE +\fBsideload\fP +.RS 4 +pico\&.sideload\&.description +.PP +.RE \fBupdate\fP .RS 4 Update the subsystem's package repository @@ -76,7 +81,12 @@ Unexport an application or binary from the subsystem .RE \fBpico-init\fP .RS 4 -Initialize the Pico subsystem, used for package management +Initialize the VSO subsystem, used for package management +.PP +.RE +\fBandroid\fP +.RS 4 +Manage the vso waydroid subsystem .PP .RE .RE @@ -210,6 +220,21 @@ Remove an application from the subsystem .RE .SS OPTIONS .SS GLOBAL OPTIONS +.SH SUBCOMMAND SIDELOAD +.RS 4 +pico\&.sideload\&.description +.RE +.SS SYNOPSIS +.RS 4 +\fBsideload\fP [command] [flags] [arguments] +.RE +.SS DESCRIPTION +.RS 4 +.TP 4 +pico\&.sideload\&.description +.RE +.SS OPTIONS +.SS GLOBAL OPTIONS .SH SUBCOMMAND UPDATE .RS 4 Update the subsystem's package repository @@ -284,6 +309,8 @@ Run an application from the subsystem Run an application from the subsystem .RE .SS OPTIONS + -n, --no-reset do not propose to reset the subsystem if something goes wrong +.PP .SS GLOBAL OPTIONS .SH SUBCOMMAND EXPORT .RS 4 @@ -325,7 +352,7 @@ Unexport an application or binary from the subsystem .SS GLOBAL OPTIONS .SH SUBCOMMAND PICO-INIT .RS 4 -Initialize the Pico subsystem, used for package management +Initialize the VSO subsystem, used for package management .RE .SS SYNOPSIS .RS 4 @@ -334,10 +361,80 @@ Initialize the Pico subsystem, used for package management .SS DESCRIPTION .RS 4 .TP 4 -Initialize the Pico subsystem, used for package management +Initialize the VSO subsystem, used for package management .RE .SS OPTIONS -f, --force force the initialization if the subsystem is already initialized .PP .SS GLOBAL OPTIONS +.SH SUBCOMMAND ANDROID +.RS 4 +Manage the vso waydroid subsystem +.RE +.SS SYNOPSIS +.RS 4 +\fBandroid\fP [command] [flags] [arguments] +.RE +.SS DESCRIPTION +.RS 4 +.TP 4 +Manage the vso waydroid subsystem +.RE +.SS OPTIONS +.SS GLOBAL OPTIONS +.SH CLEAN +.RS 4 +Cleans the waydroid vso cache +.PP +.RE +.SH DELETE +.RS 4 +Delete the waydroid subsystem +.PP +.RE +.SH INFO +.RS 4 +Display information about an application +.PP +.RE +.SH INSTALL +.RS 4 +Install an application +.PP +.RE +.SH INIT +.RS 4 +Initialize the waydroid subsystem +.PP +.RE +.SH LAUNCH +.RS 4 +Launch an installed application +.PP +.RE +.SH LAUNCHER +.RS 4 +Show the waydroid launcher +.PP +.RE +.SH REMOVE +.RS 4 +Uninstall an application +.PP +.RE +.SH SEARCH +.RS 4 +Search for an application +.PP +.RE +.SH SYNC +.RS 4 +Sync the repositories +.PP +.RE +.SH UPDATE +.RS 4 +Update installed applications +.PP +.RE diff --git a/settings/config.go b/settings/config.go index a8a0d21e..345552f7 100644 --- a/settings/config.go +++ b/settings/config.go @@ -4,7 +4,7 @@ package settings Authors: Mirko Brombin Vanilla OS Contributors - Copyright: 2023 + Copyright: 2024 Description: VSO is a utility which allows you to perform maintenance tasks on your Vanilla OS installation. */ diff --git a/usr/bin/os-shell b/usr/bin/os-shell index ffdf7e88..44fb95d0 100644 --- a/usr/bin/os-shell +++ b/usr/bin/os-shell @@ -1,4 +1,4 @@ #!/bin/sh target_shell=$(echo $SHELL) -exec "$target_shell" "$@" \ No newline at end of file +exec "$target_shell" "$@" diff --git a/usr/share/vso/apx/package-managers/apt.yaml b/usr/share/vso/apx/package-managers/apt.yaml index 2dfd0251..1be4512e 100644 --- a/usr/share/vso/apx/package-managers/apt.yaml +++ b/usr/share/vso/apx/package-managers/apt.yaml @@ -10,4 +10,4 @@ cmdsearch: search cmdshow: show cmdupdate: update cmdupgrade: upgrade -builtin: true \ No newline at end of file +builtin: true