diff --git a/web/build.rs b/web/build.rs index 715dfd19..2c8f38d0 100644 --- a/web/build.rs +++ b/web/build.rs @@ -1,6 +1,9 @@ #![feature(format_args_capture)] fn main() { + if std::fs::metadata("./src/location.rs").is_ok() { + return; + } if let Ok(contents) = std::fs::read_to_string("../.env") { for line in contents.lines() { if line.starts_with('#') { @@ -14,14 +17,14 @@ fn main() { } } - let addr = std::env::var("JIRS_SERVER_BIND").unwrap_or("0.0.0.0".to_string()); + let addr = std::env::var("JIRS_SERVER_BIND").unwrap_or_else(|_| "0.0.0.0".to_string()); let addr = if addr.as_str() == "0.0.0.0" || addr.as_str() == "localhost" { "localhost" } else { addr.as_str() } .to_string(); - let port = std::env::var("JIRS_SERVER_PORT").unwrap_or("80".to_string()); + let port = std::env::var("JIRS_SERVER_PORT").unwrap_or_else(|_| "80".to_string()); let port = match port.as_str() { "80" | "8080" | "443" => "".to_string(), _ => format!(":{}", port), diff --git a/web/scripts/prod.sh b/web/scripts/prod.sh index c47a4c4e..4a783ca7 100755 --- a/web/scripts/prod.sh +++ b/web/scripts/prod.sh @@ -1,7 +1,10 @@ #!/usr/bin/env bash -which rsass -if [[ "$status" != "0" ]]; then +export JIRS_SERVER_BIND=jirs.ita-prog.pl; +export JIRS_SERVER_PORT=443; + +RSASS_PATH=$(command -v rsass) +if [[ "${RSASS_PATH}" == "" ]]; then cargo install rsass --features=commandline fi @@ -17,18 +20,19 @@ rm -Rf build mkdir build cd $CLIENT_ROOT -wasm-pack build --mode normal --release --out-name jirs --out-dir $CLIENT_ROOT/build --target web +wasm-pack build --mode normal --release --out-name jirs --out-dir ${CLIENT_ROOT}/build --target web +# wasm-pack build --mode normal --dev --out-name jirs --out-dir ${CLIENT_ROOT}/build --target web -cd $HI_ROOT -wasm-pack build --mode normal --release --out-name hi --out-dir $CLIENT_ROOT/build --target web +#cd $HI_ROOT +#wasm-pack build --mode normal --release --out-name hi --out-dir ${CLIENT_ROOT}/build --target web cd $CLIENT_ROOT rm -Rf ${CLIENT_ROOT}/build/styles.css rsass -t Compressed ${PROJECT_ROOT}/web/js/styles.css > ${CLIENT_ROOT}/build/styles.css -cp -r ./static/* ./build +cp -r ${CLIENT_ROOT}/static/* ${CLIENT_ROOT}/build cat ./static/index.js | sed -e "s/process.env.JIRS_SERVER_BIND/'$JIRS_SERVER_BIND'/g" | - sed -e "s/process.env.JIRS_SERVER_PORT/'$JIRS_SERVER_PORT'/g" &>./build/index.js + sed -e "s/process.env.JIRS_SERVER_PORT/'$JIRS_SERVER_PORT'/g" &> ${CLIENT_ROOT}/build/index.js -cp ./js/template.html ./build/index.html +cp ${CLIENT_ROOT}/js/template.html ${CLIENT_ROOT}/build/index.html diff --git a/web/src/lib.rs b/web/src/lib.rs index 2aacf62d..2e9f1ec1 100644 --- a/web/src/lib.rs +++ b/web/src/lib.rs @@ -1,4 +1,4 @@ -#![feature(type_ascription, trait_alias, drain_filter, or_patterns)] +#![feature(type_ascription, trait_alias, drain_filter)] pub use changes::*; pub use components::*;