From 991d698ed3a31127f3b08db87edbf0d382d737a5 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 7 May 2017 17:18:42 -0600 Subject: [PATCH] Upgrade dependencies --- Cargo.lock | 30 +++++++++++++++++++----------- flash.sh | 23 +++++++++++++++++++++++ 2 files changed, 42 insertions(+), 11 deletions(-) create mode 100755 flash.sh diff --git a/Cargo.lock b/Cargo.lock index 4ad31c6..2350312 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -411,7 +411,7 @@ version = "0.1.0" dependencies = [ "extra 0.1.0 (git+https://github.com/redox-os/libextra.git)", "libgo 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "liner 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "liner 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "termion 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -554,7 +554,7 @@ dependencies = [ "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "liner 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "liner 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "peg 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "permutate 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallstring 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -655,7 +655,7 @@ dependencies = [ [[package]] name = "liner" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "termion 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1044,7 +1044,7 @@ dependencies = [ [[package]] name = "orbterm" -version = "0.1.1" +version = "0.1.2" dependencies = [ "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", "orbclient 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1173,16 +1173,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "pkgutils" version = "0.1.0" -source = "git+https://github.com/redox-os/pkgutils.git#26ec0bd59734fcbf2c24c90d03a73bae244f45a6" +source = "git+https://github.com/redox-os/pkgutils.git#b9c10c980e1724270b7e90d3c2d4999c398814b8" dependencies = [ "hyper 0.10.9 (registry+https://github.com/rust-lang/crates.io-index)", "hyper-rustls 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "liner 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "octavo 0.1.1 (git+https://github.com/libOctavo/octavo.git)", "serde 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "tar 0.4.11 (git+https://github.com/redox-os/tar-rs.git)", - "termion 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "version-compare 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1191,12 +1192,13 @@ version = "0.1.0" dependencies = [ "hyper 0.10.9 (registry+https://github.com/rust-lang/crates.io-index)", "hyper-rustls 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "liner 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "octavo 0.1.1 (git+https://github.com/libOctavo/octavo.git)", "serde 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "tar 0.4.11 (git+https://github.com/redox-os/tar-rs.git)", - "termion 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "version-compare 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1331,7 +1333,7 @@ replace = "redox_event 0.1.0" name = "redox_installer" version = "0.1.0" dependencies = [ - "liner 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "liner 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "pkgutils 0.1.0 (git+https://github.com/redox-os/pkgutils.git)", "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1989,7 +1991,7 @@ version = "0.1.0" source = "git+https://github.com/redox-os/userutils.git#3ca18917f88130f4734bcb4643a410e62e6cb24c" dependencies = [ "argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "liner 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "liner 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "termion 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2000,7 +2002,7 @@ name = "userutils" version = "0.1.0" dependencies = [ "argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "liner 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "liner 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "termion 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2033,6 +2035,11 @@ dependencies = [ "redox_syscall 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "version-compare" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "version_check" version = "0.1.0" @@ -2208,7 +2215,7 @@ dependencies = [ "checksum libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)" = "babb8281da88cba992fa1f4ddec7d63ed96280a1a53ec9b919fd37b53d71e502" "checksum libflate 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a7aa60ce680c15f96b74bd6208256f112049ab20fd6da510f27f82cb78323a77" "checksum libgo 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "99a64661b7d5c8b2ccb779e3fb0ced098426bb9bfbded934aa76ef227300e0cf" -"checksum liner 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5621a282d4baa2e8c0b815974bf3e2819eb860bfb7bf1d2f99049f10084a7102" +"checksum liner 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f9e406164c25b420480023985bdf65cef366855666ad4cb12cd3eaee82dcb399" "checksum linked-hash-map 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "f26e961e0c884309cd527b1402a5409d35db612b36915d755e1a4f5c1547a31c" "checksum linked_list_allocator 0.2.5 (git+https://github.com/phil-opp/linked-list-allocator.git)" = "" "checksum log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5141eca02775a762cc6cd564d8d2c50f67c0ea3a372cbf1c51592b3e029e10ad" @@ -2342,6 +2349,7 @@ dependencies = [ "checksum utf-8 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9aee9ba280438b56d1ebc5329f2094f0ff457f811eeeff0b278d75aa99db400" "checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f" "checksum utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "662fab6525a98beff2921d7f61a39e7d59e0b425ebc7d0d9e66d316e55124122" +"checksum version-compare 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cb766fdc689f3a5e38b2a0eb9dff9ac4a8961c09bb99064ecf88702a39b1992e" "checksum version_check 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f2edadb5308f31d97771a678c33df28f18d04f61de3fe21b9452f37854eb6c08" "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" "checksum walkdir 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c66c0b9792f0a765345452775f3adbd28dde9d33f30d13e5dcc5ae17cf6f3780" diff --git a/flash.sh b/flash.sh new file mode 100755 index 0000000..5099457 --- /dev/null +++ b/flash.sh @@ -0,0 +1,23 @@ +#!/bin/bash +set -e + +ISO="build/livedisk.iso" +DISK="/dev/disk/by-id/usb-Generic_USB_SD_Reader_12345678901234567890-0:0" + +if [ ! -f "$ISO" ] +then + echo "Did not find ISO $ISO" + exit 1 +fi + +if [ ! -b "$DISK" ] +then + echo "Did not find disk $DISK" + exit 1 +fi + +echo "Flashing $ISO to $DISK" +pv "$ISO" | sudo dd of="$DISK" +sync +sudo eject "$DISK" +echo "Successfully flashed $DISK"