Merge remote-tracking branch 'origin/master' into pkg-deb

.travis.yml

@@ -86,12 +86,12 @@ jobs:
             cross build --target $TARGET --release --verbose --all
             cp target/$TARGET/release/ffsend ./ffsend
           fi
-        - tar -czvf ./ffsend-$TARGET_SIMPLE-$TRAVIS_TAG.tar.gz ffsend
+        - tar -czvf ./ffsend-$TRAVIS_TAG-$TARGET_SIMPLE.tar.gz ffsend
         - |
           if [ -n "$DEB_ARCH" ]; then
             ./pkg/create_deb
           fi
-        - mv ./ffsend ./ffsend-$TARGET_SIMPLE-$TRAVIS_TAG
+        - mv ./ffsend ./ffsend-$TRAVIS_TAG-$TARGET_SIMPLE
       deploy: &deploy-github-release
         provider: releases
         api_key: $GITHUB_OAUTH_TOKEN
@@ -100,14 +100,14 @@ jobs:
         file_glob: true
         file:
           - ffsend_*.deb
-          - ffsend-$TARGET_SIMPLE-$TRAVIS_TAG.tar.gz
-          - ffsend-$TARGET_SIMPLE-$TRAVIS_TAG
+          - ffsend-$TRAVIS_TAG-$TARGET_SIMPLE.tar.gz
+          - ffsend-$TRAVIS_TAG-$TARGET_SIMPLE
         on:
           tags: true
           branch: master
     - stage: release
       rust: stable
-      env: TARGET=i686-unknown-linux-gnu TARGET_SIMPLE=linux-i686 DEB_ARCH=i386
+      env: TARGET=i686-unknown-linux-gnu TARGET_SIMPLE=linux-i386 DEB_ARCH=i386
       cache: cargo
       install: &install-github-release-cross
         - cargo install cross

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ffsend"
-version = "0.0.3"
+version = "0.0.5"
 authors = ["Tim Visee <timvisee@gmail.com>"]
 license = "GPL-3.0"
 readme = "README.md"

README.md

@@ -315,7 +315,7 @@ documentation [here][send-encryption].
 ```
 $ ffsend help
 
-ffsend 0.0.1
+ffsend 0.0.5
 Tim Visee <https://timvisee.com/>
 Easily and securely share files from the command line.
 A fully featured Firefox Send client.

pkg/deb/DEBIAN/control

@@ -0,0 +1,11 @@
+Package: ffsend
+Version: TODO
+Section: utils
+Priority: standard
+Architecture: TODO
+Recommends: xclip
+Maintainer: Tim Visée <timvisee@gmail.com>
+Description: easily and securely share files from the CLI using Send
+ Easily and securely share files from the command line.
+ A fully featured Firefox Send client.
+Homepage: https://github.com/timvisee/ffsend

pkg/deb/DEBIAN/postinst

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+# Create an ffs alias
+if [[ ! -f /usr/bin/ffs ]]; then
+    echo "Creating ffs alias for ffsend..."
+    ln -s /usr/bin/ffsend /usr/bin/ffs
+fi

pkg/deb/DEBIAN/prerm

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# Unlink the ffs alias if it links to ffsend
+if [[ -L /usr/bin/ffs ]] \
+    && [[ $(ls -l /usr/bin/ffs | sed -e 's/.* -> //') == "/usr/bin/ffsend" ]]; \
+then
+    echo "Removing ffs alias for ffsend..."
+    unlink /usr/bin/ffs
+fi

pkg/deb/blah.txt

@@ -0,0 +1 @@
+Some file contents