Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 6822ae3

Browse files
fix: getting askpass for every action even when it's not necessary (#1577)
Signed-off-by: leo <longshuang@msn.cn>
1 parent 184ad00 commit 6822ae3

File tree

7 files changed

+17
-6
lines changed

7 files changed

+17
-6
lines changed

‎build/resources/_common/applications/sourcegit.desktop

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Desktop Entry]
22
Name=SourceGit
33
Comment=Open-source & Free Git GUI Client
4-
Exec=/opt/sourcegit/sourcegit
4+
Exec=/usr/bin/sourcegit
55
Icon=/usr/share/icons/sourcegit.png
66
Terminal=false
77
Type=Application

‎build/resources/_common/sourcegit

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/bash
2+
3+
eval `ssh-agent -s`
4+
/opt/sourcegit/sourcegit $@

‎build/resources/appimage/sourcegit

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/bash
2+
3+
eval `ssh-agent -s`
4+
"$APPDIR/opt/sourcegit/sourcegit" $@

‎build/resources/appimage/sourcegit.png

-36.6 KB
Binary file not shown.

‎build/resources/rpm/SPECS/build.spec

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ mkdir -p %{buildroot}/%{_bindir}
2121
mkdir -p %{buildroot}/usr/share/applications
2222
mkdir -p %{buildroot}/usr/share/icons
2323
cp -f ../../../SourceGit/* %{buildroot}/opt/sourcegit/
24-
ln -rsf %{buildroot}/opt/sourcegit/sourcegit %{buildroot}/%{_bindir}
24+
cp -f ../../_common/sourcegit %{buildroot}/%{_bindir}
2525
cp -r ../../_common/applications %{buildroot}/%{_datadir}
2626
cp -r ../../_common/icons %{buildroot}/%{_datadir}
2727
chmod 755 -R %{buildroot}/opt/sourcegit
2828
chmod 755 %{buildroot}/%{_datadir}/applications/sourcegit.desktop
29+
chmod 755 %{buildroot}/%{_bindir}/sourcegit
2930

3031
%files
3132
%dir /opt/sourcegit/

‎build/scripts/package.linux.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@ cp -r SourceGit SourceGit.AppDir/opt/sourcegit
4141
desktop-file-install resources/_common/applications/sourcegit.desktop --dir SourceGit.AppDir/usr/share/applications \
4242
--set-icon com.sourcegit_scm.SourceGit --set-key=Exec --set-value=AppRun
4343
mv SourceGit.AppDir/usr/share/applications/{sourcegit,com.sourcegit_scm.SourceGit}.desktop
44-
cp resources/appimage/sourcegit.png SourceGit.AppDir/com.sourcegit_scm.SourceGit.png
45-
ln -rsf SourceGit.AppDir/opt/sourcegit/sourcegit SourceGit.AppDir/AppRun
44+
cp resources/_common/icons/sourcegit.png SourceGit.AppDir/com.sourcegit_scm.SourceGit.png
45+
cp -f resources/appimage/sourcegit SourceGit.AppDir/AppRun
46+
chmod 755 SourceGit.AppDir/AppRun
4647
ln -rsf SourceGit.AppDir/usr/share/applications/com.sourcegit_scm.SourceGit.desktop SourceGit.AppDir
4748
cp resources/appimage/sourcegit.appdata.xml SourceGit.AppDir/usr/share/metainfo/com.sourcegit_scm.SourceGit.appdata.xml
4849

@@ -53,9 +54,10 @@ mkdir -p resources/deb/usr/bin
5354
mkdir -p resources/deb/usr/share/applications
5455
mkdir -p resources/deb/usr/share/icons
5556
cp -f SourceGit/* resources/deb/opt/sourcegit
56-
ln -rsf resources/deb/opt/sourcegit/sourcegit resources/deb/usr/bin
57+
cp -f resources/_common/sourcegit resources/deb/usr/bin/
5758
cp -r resources/_common/applications resources/deb/usr/share
5859
cp -r resources/_common/icons resources/deb/usr/share
60+
chmod 755 resources/deb/usr/bin/sourcegit
5961
# Calculate installed size in KB
6062
installed_size=$(du -sk resources/deb | cut -f1)
6163
# Update the control file

‎src/Commands/Command.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ private ProcessStartInfo CreateGitStartInfo(bool redirect)
172172

173173
// If an SSH private key was provided, sets the environment.
174174
if (!start.Environment.ContainsKey("GIT_SSH_COMMAND") && !string.IsNullOrEmpty(SSHKey))
175-
start.Environment.Add("GIT_SSH_COMMAND", $"ssh -i '{SSHKey}'");
175+
start.Environment.Add("GIT_SSH_COMMAND", $"ssh -o AddKeysToAgent=yes -i {SSHKey.Quoted()}");
176176

177177
// Force using en_US.UTF-8 locale
178178
if (OperatingSystem.IsLinux())

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /