Skip to content

Commit

Permalink
fixsup: make json-dir-list pacakaged
Browse files Browse the repository at this point in the history
  • Loading branch information
apmasell committed Mar 20, 2024
1 parent 35ff7b9 commit 4e03233
Show file tree
Hide file tree
Showing 14 changed files with 718 additions and 216 deletions.
File renamed without changes.
119 changes: 110 additions & 9 deletions shawk/Cargo.lock → Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
[workspace]
resolver = '2'
members = [
'shawk',
'json-dir-list',
]

# generated by 'cargo dist init'
[profile.dist]
inherits = "release"
debug = true
split-debuginfo = "packed"

# Config for 'cargo dist'
[workspace.metadata.dist]
# The preferred cargo-dist version to use in CI (Cargo.toml SemVer syntax)
cargo-dist-version = "0.11.1"
# CI backends to support
ci = ["github"]
# The installers to generate for each app
installers = ["shell", "msi"]
# Target platforms to build apps for (Rust target-triple syntax)
targets = ["aarch64-apple-darwin", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-msvc"]
# Publish jobs to run in CI
pr-run-mode = "plan"
9 changes: 3 additions & 6 deletions docs/plugin-sftp.md
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,10 @@ structure using a `find` command to produce JSON output. This works about as
well as one could hope. If file names, user names, or group names have
characters that are now allowed in JSON strings, it does not go well. This tool
provides a more robust alternative that does the JSON encoding correctly. To
install it:
install it, first, [install Rust](https://www.rust-lang.org/tools/install) and
then invoke:

sudo apt-get install build-essential pkg-config libjsoncpp-dev
autoreconf -i
./configure --prefix=/install/dir
make
make install
cargo install --path .

Once installed, in the `.sftp` configuration for Shesmu, the `"listCommand"`
can be set to `"/install/dir/bin/json-dir-list"` to use this command instead.
20 changes: 20 additions & 0 deletions json-dir-list/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[package]
name = "json-dir-list"
version = "0.1.0"
edition = "2021"
repository = "https://github.com/oicr-gsi/shesmu"
authors = ["Andre Masella <[email protected]>"]
description = "Scans directories for Shesmu"

[package.metadata.wix]
upgrade-guid = "6C1F4D6E-D287-497C-A284-422E8C118523"
path-guid = "C77C620C-E21B-4DD6-BAD1-6D753D381C58"
license = false
eula = false

[dependencies]
chrono = "^0.4"
gethostname = "^0.4"
serde = { version = "^1.0", features = ["derive"] }
serde_json = "^1.0"
users = "^0.11"
33 changes: 0 additions & 33 deletions json-dir-list/Makefile.am

This file was deleted.

6 changes: 1 addition & 5 deletions json-dir-list/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@ names have characters that are now allowed in JSON strings, it does not go
well. This tool provides a more robust alternative that does the JSON encoding
correctly. To install it:

sudo apt-get install build-essential pkg-config libjsoncpp-dev
autoreconf -i
./configure --prefix=/install/dir
make
make install
cargo install --path .

Once installed, in the `.sftp` configuration for Shesmu, the `"listCommand"`
can be set to `"/install/dir/bin/json-dir-list"` to use this command instead.
18 changes: 0 additions & 18 deletions json-dir-list/configure.ac

This file was deleted.

17 changes: 0 additions & 17 deletions json-dir-list/json-dir-list.1

This file was deleted.

Loading

0 comments on commit 4e03233

Please sign in to comment.