From 6bc612e643460b595846c88bc9d87b5f7d5bd541 Mon Sep 17 00:00:00 2001 From: theofficialgman <28281419+theofficialgman@users.noreply.github.com> Date: Mon, 1 Jan 2024 16:46:52 -0500 Subject: [PATCH 1/2] Sublime Merge: new application for desktop git management --- apps/Sublime Merge/credits | 1 + apps/Sublime Merge/description | 4 ++++ apps/Sublime Merge/icon-24.png | Bin 0 -> 1186 bytes apps/Sublime Merge/icon-64.png | Bin 0 -> 2327 bytes apps/Sublime Merge/install-64 | 11 +++++++++++ apps/Sublime Merge/uninstall | 4 ++++ apps/Sublime Merge/website | 1 + etc/categories | 1 + 8 files changed, 22 insertions(+) create mode 100644 apps/Sublime Merge/credits create mode 100644 apps/Sublime Merge/description create mode 100644 apps/Sublime Merge/icon-24.png create mode 100644 apps/Sublime Merge/icon-64.png create mode 100755 apps/Sublime Merge/install-64 create mode 100755 apps/Sublime Merge/uninstall create mode 100644 apps/Sublime Merge/website diff --git a/apps/Sublime Merge/credits b/apps/Sublime Merge/credits new file mode 100644 index 0000000000..3ddfdccc85 --- /dev/null +++ b/apps/Sublime Merge/credits @@ -0,0 +1 @@ +Added to pi-apps by theofficialgman diff --git a/apps/Sublime Merge/description b/apps/Sublime Merge/description new file mode 100644 index 0000000000..eea6de8369 --- /dev/null +++ b/apps/Sublime Merge/description @@ -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 diff --git a/apps/Sublime Merge/icon-24.png b/apps/Sublime Merge/icon-24.png new file mode 100644 index 0000000000000000000000000000000000000000..be9bd6ad18542fed26d9072cda2103c7832b851a GIT binary patch literal 1186 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 literal 0 HcmV?d00001 diff --git a/apps/Sublime Merge/install-64 b/apps/Sublime Merge/install-64 new file mode 100755 index 0000000000..fcaf3a0a06 --- /dev/null +++ b/apps/Sublime Merge/install-64 @@ -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 diff --git a/apps/Sublime Merge/uninstall b/apps/Sublime Merge/uninstall new file mode 100755 index 0000000000..2f5810a576 --- /dev/null +++ b/apps/Sublime Merge/uninstall @@ -0,0 +1,4 @@ +#!/bin/bash + +purge_packages || exit 1 +rm_external_repo "sublimehq" diff --git a/apps/Sublime Merge/website b/apps/Sublime Merge/website new file mode 100644 index 0000000000..b05333d9f4 --- /dev/null +++ b/apps/Sublime Merge/website @@ -0,0 +1 @@ +https://www.sublimemerge.com/ diff --git a/etc/categories b/etc/categories index e000e607af..15477f6649 100644 --- a/etc/categories +++ b/etc/categories @@ -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 From 9517867bbcec076b0cdc970b2a8cbbaa4e2b2d38 Mon Sep 17 00:00:00 2001 From: theofficialgman <28281419+theofficialgman@users.noreply.github.com> Date: Mon, 1 Jan 2024 16:47:12 -0500 Subject: [PATCH 2/2] Sublime Text: update running from terminal --- apps/Sublime Text/description | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/Sublime Text/description b/apps/Sublime Text/description index 4bdbb1c389..2dfd9334e7 100644 --- a/apps/Sublime Text/description +++ b/apps/Sublime Text/description @@ -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