Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions buildenv
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Update bump details accordingly. Use bump check to confirm.
# bump: lazygit-version /LAZYGIT_VERSION="(.*)"/ https://github.com/jesseduffield/lazygit.git|semver:*
LAZYGIT_VERSION="0.46.0" # Specify a stable release
LAZYGIT_VERSION="0.49.0" # Specify a stable release
export ZOPEN_STABLE_TAG="v${LAZYGIT_VERSION}"
export ZOPEN_STABLE_URL="https://github.com/jesseduffield/lazygit.git"
export ZOPEN_STABLE_DEPS="check_go wharf"
Expand Down Expand Up @@ -33,13 +33,11 @@ zopen_build()

zopen_wharf()
{
PTY_TAG="v1.1.21"
PTY_TAG="v1.1.24"
cd .. && echo ""
git clone https://github.com/creack/pty.git
echo "Checking out $PTY_TAG"
cd pty && git -c advice.detachedHead=false checkout $PTY_TAG
curl -s -o pty--$PTY_TAG.patch "https://raw.githubusercontent.com/ZOSOpenTools/wharf/main/deps-patches/pty--$PTY_TAG.patch"
git apply -v pty--$PTY_TAG.patch
cd ..

git clone https://github.com/atotto/clipboard.git
Expand Down
41 changes: 30 additions & 11 deletions patches/lazygit.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,28 @@
diff --git a/main.go b/main.go
index d7ce1db..91137d5 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,7 @@
package main

import (
+ "os"
"github.com/jesseduffield/lazygit/pkg/app"
)

@@ -13,6 +14,7 @@ var (
)

func main() {
+ os.Setenv("__ZOS_QUICKEXIT", "1")
ldFlagsBuildInfo := &app.BuildInfo{
Commit: commit,
Date: date,
diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go
index 9d5fb3742..530a7f180 100644
index 165de3e..2894d33 100644
--- a/pkg/config/user_config.go
+++ b/pkg/config/user_config.go
@@ -702,7 +702,7 @@ func GetDefaultConfig() *UserConfig {
@@ -744,7 +744,7 @@ func GetDefaultConfig() *UserConfig {
MainPanelSplitMode: "flexible",
EnlargedSideViewLocation: "left",
WrapLinesInStagingView: true,
Expand All @@ -12,30 +32,29 @@ index 9d5fb3742..530a7f180 100644
ShortTimeFormat: time.Kitchen,
Theme: ThemeConfig{
diff --git a/pkg/i18n/i18n.go b/pkg/i18n/i18n.go
index 3848d42cf..a1cc50862 100644
index 528f381..bee5b1c 100644
--- a/pkg/i18n/i18n.go
+++ b/pkg/i18n/i18n.go
@@ -7,7 +7,7 @@ import (
"io/fs"
@@ -8,7 +8,7 @@ import (
"strings"

"dario.cat/mergo"
- "github.com/cloudfoundry/jibber_jabber"
+// "github.com/cloudfoundry/jibber_jabber"
"github.com/go-errors/errors"
"github.com/imdario/mergo"
"github.com/samber/lo"
@@ -19,8 +19,8 @@ func NewTranslationSetFromConfig(log *logrus.Entry, configLanguage string) (*Tra
if err != nil {
"github.com/sirupsen/logrus"
@@ -20,7 +20,8 @@ func NewTranslationSetFromConfig(log *logrus.Entry, configLanguage string) (*Tra
return nil, err
}
-
- if configLanguage == "auto" {
+ configLanguage = "en"
+ configLanguage = "en"
+/* if configLanguage == "auto" {
language := detectLanguage(jibber_jabber.DetectIETF)
for _, languageCode := range languageCodes {
if strings.HasPrefix(language, languageCode) {
@@ -31,7 +31,7 @@ func NewTranslationSetFromConfig(log *logrus.Entry, configLanguage string) (*Tra
@@ -31,7 +32,7 @@ func NewTranslationSetFromConfig(log *logrus.Entry, configLanguage string) (*Tra
// Detecting a language that we don't have a translation for is not an
// error, we'll just use English.
return EnglishTranslationSet(), nil
Expand Down
Loading