Merge branch 'release/v8.19'

Author: love-linger

README.md

@@ -21,6 +21,7 @@ Opensource Git GUI client.
   * Tags
   * Stashes
   * Submodules
+  * Worktrees
   * Archive
   * Diff
   * Save as patch/apply
@@ -105,7 +106,8 @@ This app supports open repository in external tools listed in the table below.
 | Color.ToolBar | Tool bar background color |
 | Color.Popup | Popup panel background color |
 | Color.Contents | Background color used in inputs, data grids, file content viewer, change lists, text diff viewer, etc. |
-| Color.Badage | Badage background color |
+| Color.Badge | Badge background color |
+| Color.BadgeFG | Badge foreground color |
 | Color.Conflict | Conflict panel background color |
 | Color.ConflictForeground | Conflict panel foreground color |
 | Color.Border0 | Border color used in some controls, like Window, Tab, Toolbar, etc. |

VERSION

@@ -1 +1 @@
-8.18
+8.19

build/build.linux.sh

@@ -17,12 +17,12 @@ rm -f SourceGit/sourcegit.icns
 
 # Debain/Ubuntu package
 mkdir -p resources/deb/opt/sourcegit/
-mkdir -p resources/deb/usr/bin
 mkdir -p resources/deb/usr/share/applications
 mkdir -p resources/deb/usr/share/icons
 cp -f SourceGit/* resources/deb/opt/sourcegit/
-cp -r resources/_common/usr resources/deb/
-chmod -R 755 resources/deb
+cp -r resources/_common/applications resources/deb/usr/share/
+cp -r resources/_common/icons resources/deb/usr/share/
+chmod +x -R resources/deb/opt/sourcegit
 sed -i "2s/.*/Version: ${version}/g" resources/deb/DEBIAN/control
 dpkg-deb --build resources/deb ./sourcegit_${version}-1_amd64.deb
 

build/resources/_common/usr/share/applications/sourcegit.desktop renamed to build/resources/_common/applications/sourcegit.desktop

@@ -1,5 +1,5 @@
 Package: sourcegit
-Version: 8.8
+Version: 8.18
 Priority: optional
 Depends: libx11-6, libice6, libsm6
 Architecture: amd64

build/resources/_common/usr/share/icons/sourcegit.png renamed to build/resources/_common/icons/sourcegit.png

@@ -0,0 +1,5 @@
+#!bin/sh
+
+echo 'Create link on /usr/bin'
+ln -s /opt/sourcegit/sourcegit /usr/bin/sourcegit
+exit 0

build/resources/_common/usr/bin/sourcegit

@@ -0,0 +1,4 @@
+#!bin/sh
+
+rm -f /usr/bin/sourcegit
+exit 0

build/resources/deb/DEBIAN/control

@@ -15,17 +15,23 @@ Open-source & Free Git Gui Client
 
 %install
 mkdir -p $RPM_BUILD_ROOT/opt/sourcegit
-mkdir -p $RPM_BUILD_ROOT/usr/bin
 mkdir -p $RPM_BUILD_ROOT/usr/share/applications
 mkdir -p $RPM_BUILD_ROOT/usr/share/icons
-cp -r ../../_common/usr $RPM_BUILD_ROOT/
+cp -r ../../_common/applications $RPM_BUILD_ROOT/usr/share/
+cp -r ../../_common/icons $RPM_BUILD_ROOT/usr/share/
 cp -f ../../../SourceGit/* $RPM_BUILD_ROOT/opt/sourcegit/
-chmod 755 -R $RPM_BUILD_ROOT
+chmod 755 -R $RPM_BUILD_ROOT/opt/sourcegit
+chmod 755 $RPM_BUILD_ROOT/usr/share/applications/sourcegit.desktop
 
 %files
-/opt
-%attr(555,root,root)/usr/bin
+/opt/sourcegit
 /usr/share
 
+%post
+ln -s /opt/sourcegit/sourcegit /usr/bin/sourcegit
+
+%postun
+rm -f /usr/bin/sourcegit
+
 %changelog
 # skip