Add official logo

Cargo.toml

@@ -105,13 +105,13 @@ section = "rust"
 priority = "optional"
 assets = [
     ["target/release/alacritty", "usr/bin/", "755"],
-    ["alacritty.desktop", "usr/share/applications/", "644"],
-    ["alacritty-completions.bash", "usr/share/bash-completion/completions/alacritty", "644"],
-    ["alacritty-completions.fish", "usr/share/fish/completions/alacritty.fish", "644"],
-    ["alacritty-completions.zsh", "usr/share/zsh/vendor-completions/_alacritty", "644"],
-    ["alacritty.info", "usr/share/terminfo/a/alacritty", "644"],
+    ["extra/linux/alacritty.desktop", "usr/share/applications/", "644"],
+    ["extra/completions/alacritty.bash", "usr/share/bash-completion/completions/alacritty", "644"],
+    ["extra/completions/alacritty.fish", "usr/share/fish/completions/alacritty.fish", "644"],
+    ["extra/completions/_alacritty", "usr/share/zsh/vendor-completions/_alacritty", "644"],
+    ["extra/alacritty.info", "usr/share/terminfo/a/alacritty", "644"],
 ]
-maintainer-scripts = "debian"
+maintainer-scripts = "extra/linux/debian"
 
 [patch.crates-io]
 servo-freetype-sys = { path = "servo-freetype-proxy" }

INSTALL.md

@@ -194,7 +194,7 @@ system menus. To install the desktop entry for Alacritty, run
 
 ```sh
 sudo cp target/release/alacritty /usr/local/bin # or anywhere else in $PATH
-sudo desktop-file-install alacritty.desktop
+sudo desktop-file-install extra/linux/alacritty.desktop
 sudo update-desktop-database
 ```
 
@@ -237,7 +237,7 @@ To install the manual page, run
 
 ```sh
 sudo mkdir -p /usr/local/share/man/man1
-gzip -c alacritty.man | sudo tee /usr/local/share/man/man1/alacritty.1.gz > /dev/null
+gzip -c extra/alacritty.man | sudo tee /usr/local/share/man/man1/alacritty.1.gz > /dev/null
 ```
 
 ## Shell completions
@@ -246,7 +246,8 @@ To get automatic completions for alacritty's flags and arguments you can install
 
 ### Zsh
 
-To install the completions for zsh, you can place the `alacritty-completions.zsh` as `_alacritty` in any directory referenced by `$fpath`.
+To install the completions for zsh, you can place the `extra/completions/_alacritty` file in any
+directory referenced by `$fpath`.
 
 If you do not already have such a directory registered through your `~/.zshrc`, you can add one like this:
 
@@ -258,24 +259,25 @@ echo 'fpath+=${ZDOTDIR:-~}/.zsh_functions' >> ${ZDOTDIR:-~}/.zshrc
 Then copy the completion file to this directory:
 
 ```sh
-cp alacritty-completions.zsh ${ZDOTDIR:-~}/.zsh_functions/_alacritty
+cp extra/completions/_alacritty ${ZDOTDIR:-~}/.zsh_functions/_alacritty
 ```
 
 ### Bash
 
-To install the completions for bash, you can `source` the `alacritty-completions.bash` in your `~/.bashrc` file.
+To install the completions for bash, you can `source` the `extra/completions/alacritty.bash` file
+in your `~/.bashrc` file.
 
 If you do not plan to delete the source folder of alacritty, you can run
 
 ```sh
-echo "source $(pwd)/alacritty-completions.bash" >> ~/.bashrc
+echo "source $(pwd)/extra/completions/alacritty.bash" >> ~/.bashrc
 ```
 
 Otherwise you can copy it to the `~/.bash_completion` folder and source it from there:
 
 ```sh
 mkdir -p ~/.bash_completion
-cp alacritty-completions.bash ~/.bash_completion/alacritty
+cp extra/completions/alacritty.bash ~/.bash_completion/alacritty
 echo "source ~/.bash_completion/alacritty" >> ~/.bashrc
 ```
 
@@ -284,7 +286,7 @@ echo "source ~/.bash_completion/alacritty" >> ~/.bashrc
 To install the completions for fish, run
 
 ```
-sudo cp alacritty-completions.fish $__fish_data_dir/vendor_completions.d/alacritty.fish
+sudo cp extra/completions/alacritty.fish $__fish_data_dir/vendor_completions.d/alacritty.fish
 ```
 
 **Note:** For fish versions below 3.0 `$__fish_datadir` must be used instead.
@@ -307,5 +309,5 @@ instead.
 To install alacritty's terminfo entry globally:
 
 ```sh
-sudo tic -xe alacritty,alacritty-direct alacritty.info
+sudo tic -xe alacritty,alacritty-direct extra/alacritty.info
 ```

Makefile

@@ -1,7 +1,7 @@
 TARGET = alacritty
 
 APP_NAME = Alacritty.app
-ASSETS_DIR = assets
+ASSETS_DIR = extra
 RELEASE_DIR = target/release
 APP_TEMPLATE = $(ASSETS_DIR)/osx/$(APP_NAME)
 APP_DIR = $(RELEASE_DIR)/osx

README.md

@@ -1,7 +1,7 @@
-Alacritty
-=========
-
-[![Travis build Status](https://travis-ci.org/jwilm/alacritty.svg?branch=master)](https://travis-ci.org/jwilm/alacritty)
+<h1 align="center">Alacritty</h1>
+<p align="center">
+    <img width="200" alt="Alacritty Logo" src="extra/logo/alacritty-term+scanlines.svg">
+</p>
 
 Alacritty is the fastest terminal emulator in existence. Using the GPU for
 rendering enables optimizations that simply aren't possible without it.

build.rs

@@ -45,7 +45,7 @@ fn main() {
 
     #[cfg(windows)]
     {
-        embed_resource::compile("assets/windows/windows.rc");
+        embed_resource::compile("extra/windows/windows.rc");
 
         // Path is relative to target/{profile}/build/alacritty-HASH/out
         let file = Path::new(&env::var("OUT_DIR").unwrap()).join("../../../winpty-agent.exe");

ci/before_deploy.sh

@@ -62,9 +62,8 @@ elif [ "$TRAVIS_OS_NAME" == "windows" ]; then
         "./target/release/winpty-agent.exe"
 
     # Create msi installer
-    ./WiX.*/tools/candle.exe -nologo -arch "x64" -ext WixUIExtension -ext WixUtilExtension -out "wix/alacritty.wixobj" "wix/alacritty.wxs"
-    ./WiX.*/tools/light.exe -nologo -ext WixUIExtension -ext WixUtilExtension -out "wix/alacritty.msi" -sice:ICE61 -sice:ICE91 "wix/alacritty.wixobj"
-    mv "./wix/alacritty.msi" "./target/deploy/${name}-windows-installer.msi"
+    ./WiX.*/tools/candle.exe -nologo -arch "x64" -ext WixUIExtension -ext WixUtilExtension -out "target/alacritty.wixobj" "extra/windows/wix/alacritty.wxs"
+    ./WiX.*/tools/light.exe -nologo -ext WixUIExtension -ext WixUtilExtension -out "target/deploy/${name}-windows-installer.msi" -sice:ICE61 -sice:ICE91 "target/alacritty.wixobj"
 fi
 
 # Convert and add manpage if it changed