script fixes

refinedrust.opam

@@ -11,7 +11,7 @@ RefinedRust is a prototype framework for verifying safe and unsafe Rust code.
 license: "BSD-3-Clause"
 
 depends: [
-  "coq-lithium" {= version | = "~dev"}
+  "coq-lithium" {= version | = "dev"}
   "coq-equations" { = "1.3+8.17" }
   "coq-lambda-rust" { = "dev" }
 ]

rr_frontend/refinedrust

@@ -88,7 +88,7 @@ case "$COMMAND" in
 install|install-debug)
     # "--locked" to respect the Cargo.lock file if it exists,
     # "--offline" to avoid querying the registry (for yanked packages).
-    cargo install $CARGO_INSTALL_FLAGS --path "$RRDIR" --force --locked --offline "$@"
+    cd translation; cargo install $CARGO_INSTALL_FLAGS --path "$RRDIR" --force --locked --offline "$@"
     ;;
 check|check-debug)
     # Check, and let caller control flags.

rr_frontend/rustup-toolchain

@@ -26,6 +26,9 @@
 
 #!/bin/bash
 set -e
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
 # Manages a rustup toolchain called "refinedrust".
 #
 # All commands set "refinedrust" as the override toolchain for the current directory,
@@ -47,13 +50,13 @@ fi
 
 # Determine new commit.
 if [[ "$1" == "" ]]; then
-    NEW_COMMIT=$(cat rust-version)
+    NEW_COMMIT=$(cat "$SCRIPT_DIR/rust-version")
 elif [[ "$1" == "HEAD" ]]; then
     NEW_COMMIT=$(git ls-remote https://github.com/rust-lang/rust/ HEAD | cut -f 1)
 else
     NEW_COMMIT="$1"
 fi
-echo "$NEW_COMMIT" > rust-version
+echo "$NEW_COMMIT" > "$SCRIPT_DIR/rust-version"
 
 # Check if we already are at that commit.
 CUR_COMMIT=$(rustc +refinedrust --version -v 2>/dev/null | egrep "^commit-hash: " | cut -d " " -f 2)

rr_frontend/translation/Cargo.toml

 [package]
-name = "frontend"
+name = "refinedrust_translate"
 version = "0.1.0"
 edition = "2018"
 

scripts/setup-rust.sh

@@ -6,5 +6,5 @@
 
 cd $REFINEDRUST_ROOT
 cargo install rustup-toolchain-install-master
-./rr_frontend/rustup-toolchain
-./rr_frontend/refinedrust build
+$REFINEDRUST_ROOT/rr_frontend/rustup-toolchain
+$REFINEDRUST_ROOT/rr_frontend/refinedrust build