From a49d65476fe0202c30de14b03d42eff0481ffa46 Mon Sep 17 00:00:00 2001 From: Rychart Redwerkz Date: Mon, 6 Mar 2023 05:10:56 +0100 Subject: [PATCH] [BRANDING] Rebrand dump log (cherry picked from commit b92a65a23f8d586d30336c79596ee8a73e6c2dad) (cherry picked from commit eaeb9f183ff9fdb9710b776bb26b0920e34065c0) (cherry picked from commit cdbd0ebe5eb4db0c89e82893cba503bcdbfe7bbf) (cherry picked from commit 8aaa4e3f4d67cb8f077ca1d115d04a9c966c18ee) (cherry picked from commit 6d7d3f048e3639bc9683ff157f7d9530dfc2e1cb) (cherry picked from commit 1b6a2971ad4c84e33ff882fdf81ca6f46ba3cb44) (cherry picked from commit 4f7f35043daecefa0ddb5c6f3afcf033d091c362) (cherry picked from commit 495a4351b160800723e159244f7aa843f536c926) (cherry picked from commit 12d89b03a97dba8468a4526d9ee6af40643f9885) (cherry picked from commit 476d49ff11d32deba7d087f097e656669f3a840a) (cherry picked from commit d6e95828c3f13f6a79d5657764d245701500a57c) (cherry picked from commit d043e8d69d942c0950180bbb3ab2c97783a022e3) (cherry picked from commit b06027344270d2dbd724695e8084a39b2e7563b8) (cherry picked from commit 20437285c553f8aa5c7a857c98d1680798eac592) (cherry picked from commit 0bc9eee5f31eacae875668e3cd4ba399ad98d9f5) (cherry picked from commit b9f843776f4a80d646743fd5cca2579ddf46dd5b) (cherry picked from commit e6d64de500e4324d574d1715cb5dc49b7bf672fb) (cherry picked from commit 5ce2ff2f8b7049c5b3e1ce5bebcaf40368ea7641) (cherry picked from commit 659677cf886c396a76aa7426df312d5ff44ce094) (cherry picked from commit 648a5d944e9e9bb1a9a09cdc37b311db0a7f3f79) (cherry picked from commit a77c8be7042cc67c6043732cffabdeabd42d117d) (cherry picked from commit 012cb570464deb87060322b43da872362ce69533) (cherry picked from commit 2da63c976eacf9c481d9561539e2abd04c0b5ea6) (cherry picked from commit 792ce8b1b7045c8559d39aaa4dc86ef24609034f) (cherry picked from commit a4b3244712317fa64e27f8d471203648113759f6) (cherry picked from commit 9ffc3571f184430502ce2b63c80e6f25661dd885) (cherry picked from commit 6aadfd01201f5c715b2aed1a73a3832b9722d81b) (cherry picked from commit bdfc590b568b72c6687e94c512ae06bb864d032a) (cherry picked from commit 6d4f25799f1fa60ba586cf211ddb6aa8c59b4739) (cherry picked from commit fa39bb1b0e5183481f1c8c6c9e27e37377561d54) (cherry picked from commit b9f86b4dc5e600dedd5cbd9414268f3c247bbf98) (cherry picked from commit 14a60da5b3fdbfd262ee6474053a0e86bb0829e8) (cherry picked from commit d198a93f7094549aaa7623b8194f5bc09279ac87) (cherry picked from commit f74a07d872e05d71aad6ed9d4f0e37e7ea174987) (cherry picked from commit 50460b09256c58132ca8ed1a14dd818ee376244d) (cherry picked from commit 762847ef0c8d8c9109c12383a09b94f47b8728e8) (cherry picked from commit f6ebea410d4845f0e154fc51df1ef96aac444987) (cherry picked from commit b08e1dcfa9f81c79b65d76cbfaa92aa0ec0e3763) (cherry picked from commit e5e4f184888daf90667fe8a7988f1a072aedba65) (cherry picked from commit d8c600bd79e16adb1576006af68a7191324ca852) (cherry picked from commit cbaa08770d5ee048439db37caeb01285929a5ec5) --- cmd/dump.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/dump.go b/cmd/dump.go index 69ecdcec12..6fbd049191 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -98,15 +98,15 @@ var outputTypeEnum = &outputType{ // CmdDump represents the available dump sub-command. var CmdDump = &cli.Command{ Name: "dump", - Usage: "Dump Gitea files and database", + Usage: "Dump Forgejo files and database", Description: `Dump compresses all related files and database into zip file. -It can be used for backup and capture Gitea server image to send to maintainer`, +It can be used for backup and capture Forgejo server image to send to maintainer`, Action: runDump, Flags: []cli.Flag{ &cli.StringFlag{ Name: "file", Aliases: []string{"f"}, - Value: fmt.Sprintf("gitea-dump-%d.zip", time.Now().Unix()), + Value: fmt.Sprintf("forgejo-dump-%d.zip", time.Now().Unix()), Usage: "Name of the dump file which will be created. Supply '-' for stdout. See type for available types.", }, &cli.BoolFlag{ @@ -209,7 +209,7 @@ func runDump(ctx *cli.Context) error { if !setting.InstallLock { log.Error("Is '%s' really the right config path?\n", setting.CustomConf) - return fmt.Errorf("gitea is not initialized") + return fmt.Errorf("forgejo is not initialized") } setting.LoadSettings() // cannot access session settings otherwise @@ -288,7 +288,7 @@ func runDump(ctx *cli.Context) error { fatal("Path does not exist: %s", tmpDir) } - dbDump, err := os.CreateTemp(tmpDir, "gitea-db.sql") + dbDump, err := os.CreateTemp(tmpDir, "forgejo-db.sql") if err != nil { fatal("Failed to create tmp file: %v", err) } @@ -310,8 +310,8 @@ func runDump(ctx *cli.Context) error { fatal("Failed to dump database: %v", err) } - if err := addFile(w, "gitea-db.sql", dbDump.Name(), verbose); err != nil { - fatal("Failed to include gitea-db.sql: %v", err) + if err := addFile(w, "forgejo-db.sql", dbDump.Name(), verbose); err != nil { + fatal("Failed to include forgejo-db.sql: %v", err) } if len(setting.CustomConf) > 0 {