summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Wernick <j.wernick@eyeo.com>2023-05-10 15:09:05 +0200
committerJustin Wernick <j.wernick@eyeo.com>2023-05-10 15:09:22 +0200
commitcae34ef0b7b6e47f1ed3efe71ac658105a75a530 (patch)
tree918bdedbaac3f70d957bb97c715af4844db56bb3
parent22a206f083a5e75a589a656d40ba1fca538720e5 (diff)
Rename the package to something not taken on crates.io
-rw-r--r--Cargo.lock2
-rw-r--r--Cargo.toml2
-rw-r--r--Dockerfile8
-rw-r--r--readme.org8
-rw-r--r--src/main.rs2
5 files changed, 11 insertions, 11 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 4141147..2b48951 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -673,7 +673,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
[[package]]
-name = "shackle"
+name = "shackle-shell"
version = "0.1.0"
dependencies = [
"anyhow",
diff --git a/Cargo.toml b/Cargo.toml
index c0f76b7..644f4e4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
[package]
-name = "shackle"
+name = "shackle-shell"
version = "0.1.0"
authors = ["Justin Wernick <justin@worthe-it.co.za>"]
edition = "2021"
diff --git a/Dockerfile b/Dockerfile
index 96c605f..52cc9fe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ RUN sed -i /etc/ssh/sshd_config \
-e 's/#PasswordAuthentication.*/PasswordAuthentication yes/' \
-e 's/#PermitEmptyPasswords.*/PermitEmptyPasswords yes/'
-RUN adduser --shell /usr/bin/shackle shukkie && passwd -d shukkie
+RUN adduser --shell /usr/bin/shackle-shell shukkie && passwd -d shukkie
RUN mkdir -p /home/shukkie/git/shukkie && \
chown -R shukkie:shukkie /home/shukkie/git
RUN groupadd shukkies-company --users shukkie && \
@@ -22,11 +22,11 @@ RUN git init --bare /home/shukkie/disallowed.git && \
chown -R shukkie:shukkie /home/shukkie/disallowed.git
COPY . /opt/shackle
-ARG SHELL=target/debug/shackle
-RUN cp /opt/shackle/${SHELL} /usr/bin/shackle
+ARG SHELL=target/debug/shackle-shell
+RUN cp /opt/shackle/${SHELL} /usr/bin/shackle-shell
ENTRYPOINT service ssh start && echo "Ready" && bash
-# docker build -t shackle-server --build-arg SHELL=target/debug/shackle ./
+# docker build -t shackle-server --build-arg SHELL=target/debug/shackle-shell ./
# docker run -it -p 2022:22 shackle-server
# ssh -p 2022 shukkie@localhost \ No newline at end of file
diff --git a/readme.org b/readme.org
index ebb2f14..e8a140c 100644
--- a/readme.org
+++ b/readme.org
@@ -144,7 +144,7 @@ mean that if you login as the user, for example over ssh, then the default shell
will be Shackle.
#+begin_src sh
- sudo usermod --shell $HOME/.cargo/bin/shackle $USER
+ sudo usermod --shell $HOME/.cargo/bin/shackle-shell $USER
#+end_src
* Operating System Support
@@ -230,7 +230,7 @@ Release binaries should be built in release mode.
cargo build --release
#+end_src
-After running this, the binary is available in =./target/release/shackle=
+After running this, the binary is available in =./target/release/shackle-shell=
* Roadmap / Issue Tracker TODO list
@@ -269,9 +269,9 @@ After running this, the binary is available in =./target/release/shackle=
- [X] proper licensing
- [X] all the getting started stuff in the readme
-- [ ] clean up crates.io metadata
+- [-] clean up crates.io metadata
- [ ] crates.io friendly readme: needs to be markdown, and probably not all the content of the "full" readme
- - [ ] rename to something that isn't taken on crates.io (shackle-shell)
+ - [X] rename to something that isn't taken on crates.io (shackle-shell)
- [ ] publish to crates.io
- [ ] project website
- [ ] functions correctly when the git path isn't created yet
diff --git a/src/main.rs b/src/main.rs
index 99b755d..9984c8c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,6 +1,6 @@
use clap::Parser;
use rustyline::{error::ReadlineError, DefaultEditor};
-use shackle::{run_command, ShackleError};
+use shackle_shell::{run_command, ShackleError};
/// Shackle Shell - A replacement for git-shell with repo management commands built in.
#[derive(Parser, Debug)]