Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New app: Sublime Merge #2509

Merged
merged 2 commits into from
Jan 1, 2024
Merged

New app: Sublime Merge #2509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bc612e
Sublime Merge: new application for desktop git management
theofficialgman Jan 1, 2024
9517867
Sublime Text: update running from terminal
theofficialgman Jan 1, 2024
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
1 change: 1 addition & 0 deletions apps/Sublime Merge/credits
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Added to pi-apps by theofficialgman
4 changes: 4 additions & 0 deletions apps/Sublime Merge/description
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Git Client, done Sublime. Line-by-line Staging. Commit Editing. Unmatched Performance.

To run: Menu -> Programming -> Sublime Merge
To run in a terminal: smerge
Binary file added apps/Sublime Merge/icon-24.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/Sublime Merge/icon-64.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions apps/Sublime Merge/install-64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/bash

add_external_repo "sublimehq" "https://download.sublimetext.com/sublimehq-pub.gpg" "https://download.sublimetext.com/" "apt/stable/" || exit 1

apt_update
if [ $? != 0 ]; then
rm_external_repo "sublimehq"
error "Failed to perform apt update after adding sublimehq repository."
fi

install_packages sublime-merge || exit 1
4 changes: 4 additions & 0 deletions apps/Sublime Merge/uninstall
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash

purge_packages || exit 1
rm_external_repo "sublimehq"
1 change: 1 addition & 0 deletions apps/Sublime Merge/website
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
https://www.sublimemerge.com/
2 changes: 1 addition & 1 deletion apps/Sublime Text/description
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ However on arm64 based Operating Systems this runs the latest Sublime Text 4 wit

To run: Menu -> Programming -> Sublime Text
To run in a terminal if you are using a 32-bit OS: box86 ~/'Sublime Text 2'/sublime_text
To run in a terminal if you are using a 64-bit OS: /opt/sublime_text/sublime_text
To run in a terminal if you are using a 64-bit OS: subl
1 change: 1 addition & 0 deletions etc/categories
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ Steam|Games
Steam Link|Games
StepMania|Games
Stunt Rally|hidden
Sublime Merge|Programming
Sublime Text|Programming
Synaptic|System Management
Syncthing|System Management
Expand Down