This repository has been archived by the owner on Sep 2, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 614
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #297 from adobe/jasonsanjose/linux-sprint-29
Linux Sprint 29
- Loading branch information
Showing
18 changed files
with
332 additions
and
155 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...n/usr/share/applications/brackets.desktop → installer/linux/debian/brackets.desktop
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| [Desktop Entry] | ||
| Name=Brackets | ||
| Type=Application | ||
| Categories=Application | ||
| Exec=/usr/lib/brackets/Brackets %U | ||
| Categories=Development | ||
| Exec=/opt/brackets/Brackets %U | ||
| Icon=brackets | ||
| MimeType=text/html; |
10 changes: 5 additions & 5 deletions
10
installer/linux/debian/DEBIAN/control → installer/linux/debian/control
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| #!/bin/sh | ||
| # | ||
| # Copyright (c) 2009 The Chromium Authors. All rights reserved. | ||
| # Use of this source code is governed by a BSD-style license that can be | ||
| # found in the LICENSE file. | ||
|
|
||
| # Add icons to the system icons | ||
| XDG_ICON_RESOURCE="`which xdg-icon-resource 2> /dev/null`" | ||
| if [ ! -x "$XDG_ICON_RESOURCE" ]; then | ||
| echo "Error: Could not find xdg-icon-resource" >&2 | ||
| exit 1 | ||
| fi | ||
| for icon in "/opt/brackets/appshell"*.png; do | ||
| size="${icon##*/appshell}" | ||
| "$XDG_ICON_RESOURCE" install --novendor --size "${size%.png}" "$icon" "brackets" | ||
| done | ||
|
|
||
| # Add an entry to the system menu | ||
| XDG_DESKTOP_MENU="`which xdg-desktop-menu 2> /dev/null`" | ||
| UPDATE_MENUS="`which update-menus 2> /dev/null`" | ||
| if [ ! -x "$XDG_DESKTOP_MENU" ]; then | ||
| echo "Error: Could not find xdg-desktop-menu" >&2 | ||
| exit 1 | ||
| fi | ||
| "$XDG_DESKTOP_MENU" install /opt/brackets/brackets.desktop --novendor | ||
|
|
||
| if [ -x "$UPDATE_MENUS" ]; then | ||
| update-menus | ||
| fi | ||
|
|
||
| DEFAULT_ARCH="`uname -m`" | ||
|
|
||
| get_lib_dir() { | ||
| if [ "$DEFAULT_ARCH" = "i686" ]; then | ||
| LIBDIR=lib/i386-linux-gnu | ||
| elif [ "$DEFAULT_ARCH" = "x86_64" ]; then | ||
| LIBDIR=lib/x86_64-linux-gnu | ||
| else | ||
| echo Unknown CPU Architecture: "$DEFAULT_ARCH" | ||
| exit 1 | ||
| fi | ||
| } | ||
|
|
||
| # Fedora 18 now has libudev.so.1. http://crbug.com/145160 | ||
| # Same for Ubuntu 13.04. http://crbug.com/226002 | ||
| LIBUDEV_0=libudev.so.0 | ||
| LIBUDEV_1=libudev.so.1 | ||
|
|
||
| add_udev_symlinks() { | ||
| get_lib_dir | ||
| if [ -f "/$LIBDIR/$LIBUDEV_0" -o -f "/usr/$LIBDIR/$LIBUDEV_0" -o -f "/lib/$LIBUDEV_0" ]; then | ||
| return 0 | ||
| fi | ||
|
|
||
| if [ -f "/$LIBDIR/$LIBUDEV_1" ]; then | ||
| ln -snf "/$LIBDIR/$LIBUDEV_1" "/opt/brackets/$LIBUDEV_0" | ||
| elif [ -f "/usr/$LIBDIR/$LIBUDEV_1" ]; | ||
| then | ||
| ln -snf "/usr/$LIBDIR/$LIBUDEV_1" "/opt/brackets/$LIBUDEV_0" | ||
| else | ||
| echo "$LIBUDEV_1" not found in "$LIBDIR" or "/usr/$LIBDIR". | ||
| exit 1 | ||
| fi | ||
| } | ||
|
|
||
| remove_udev_symlinks() { | ||
| rm -rf "/opt/brackets/$LIBUDEV_0" | ||
| } | ||
|
|
||
| remove_udev_symlinks | ||
| add_udev_symlinks |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| #!/bin/sh | ||
| rm -rf "/opt/brackets/libudev.so.0" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| #!/bin/sh | ||
| # | ||
| # Copyright (c) 2009 The Chromium Authors. All rights reserved. | ||
| # Use of this source code is governed by a BSD-style license that can be | ||
| # found in the LICENSE file. | ||
|
|
||
| action="$1" | ||
| if [ "$2" = "in-favour" ]; then | ||
| # Treat conflict remove as an upgrade. | ||
| action="upgrade" | ||
| fi | ||
| # Don't clean-up just for an upgrade.` | ||
| if [ "$action" = "upgrade" ] ; then | ||
| exit 0 | ||
| fi | ||
|
|
||
| # Remove icons from the system icons | ||
| XDG_ICON_RESOURCE="`which xdg-icon-resource 2> /dev/null`" | ||
| if [ ! -x "$XDG_ICON_RESOURCE" ]; then | ||
| echo "Error: Could not find xdg-icon-resource" >&2 | ||
| exit 1 | ||
| fi | ||
| for icon in "/opt/brackets/appshell"*.png; do | ||
| size="${icon##*/appshell}" | ||
| "$XDG_ICON_RESOURCE" uninstall --size "${size%.png}" "brackets" | ||
| done | ||
|
|
||
| # Remove the entry from the system menu | ||
| XDG_DESKTOP_MENU="`which xdg-desktop-menu 2> /dev/null`" | ||
| UPDATE_MENUS="`which update-menus 2> /dev/null`" | ||
| if [ ! -x "$XDG_DESKTOP_MENU" ]; then | ||
| echo "Error: Could not find xdg-desktop-menu" >&2 | ||
| exit 1 | ||
| fi | ||
| "$XDG_DESKTOP_MENU" uninstall /opt/brackets/brackets.desktop | ||
|
|
||
| if [ -x "$UPDATE_MENUS" ]; then | ||
| update-menus | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| #!/bin/bash | ||
| /opt/brackets/Brackets |
19 changes: 19 additions & 0 deletions
19
installer/linux/debian/package-root/usr/share/doc/brackets/copyright
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved. | ||
|
|
||
| Permission is hereby granted, free of charge, to any person obtaining a | ||
| copy of this software and associated documentation files (the "Software"), | ||
| to deal in the Software without restriction, including without limitation | ||
| the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
| and/or sell copies of the Software, and to permit persons to whom the | ||
| Software is furnished to do so, subject to the following conditions: | ||
|
|
||
| The above copyright notice and this permission notice shall be included in | ||
| all copies or substantial portions of the Software. | ||
|
|
||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
| DEALINGS IN THE SOFTWARE. |
File renamed without changes
6 changes: 6 additions & 0 deletions
6
installer/linux/debian/package-root/usr/share/menu/brackets.menu
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| ?package(brackets):needs="x11" \ | ||
| section="Development" \ | ||
| hints="Code Editor" \ | ||
| title="Brackets" \ | ||
| icon="/opt/brackets/appshell32.png" \ | ||
| command="/usr/bin/brackets" |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.