Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Assorted fixes #42

Open
wants to merge 3 commits into
base: stable
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion install/10-create-user.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/usr/bin/sh -e
#!/usr/bin/env sh

set -e

# Copyright © 2021 Jeff Kletsky. All Rights Reserved.
#
Expand Down
4 changes: 3 additions & 1 deletion install/20-create-dirs.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/usr/bin/sh -e
#!/usr/bin/env sh

set -e

# Copyright © 2021, 2022 Jeff Kletsky. All Rights Reserved.
#
Expand Down
4 changes: 3 additions & 1 deletion install/30-populate-venv.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/usr/bin/sh -e
#!/usr/bin/env sh

set -e

# Copyright © 2021 Jeff Kletsky. All Rights Reserved.
#
Expand Down
6 changes: 4 additions & 2 deletions install/40-config-files.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/usr/bin/sh -e
#!/usr/bin/env sh

set -e

# Copyright © 2021, 2023 Jeff Kletsky. All Rights Reserved.
#
Expand Down Expand Up @@ -30,7 +32,7 @@ for f in /usr/local/etc/pyde1/*.service ; do
sed -i'.bak' \
-e "s|^User=.*|User=${PYDE1_USER}|" \
-e "s|^Group=.*|Group=${PYDE1_GROUP}|" \
-e "s|/home/pyde1/venv/pyde1|${VENV_PATH}"
-e "s|/home/pyde1/venv/pyde1|${VENV_PATH}|" \
$f
done

Expand Down
4 changes: 3 additions & 1 deletion install/50-enable-services.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/usr/bin/sh -e
#!/usr/bin/env sh

set -e

# Copyright © 2021 Jeff Kletsky. All Rights Reserved.
#
Expand Down
6 changes: 3 additions & 3 deletions src/pyDE1/database/schema/schema.003.sql
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
-- GNU General Public License v3.0 only
-- SPDX-License-Identifier: GPL-3.0-only

-- Schema version 2
-- Schema version 3
-- TODO: How to detect current schema, run upgrade triggers,
-- and then set PRAGMA user_version

Expand All @@ -29,7 +29,7 @@ PRAGMA journal_mode=WAL;

BEGIN TRANSACTION;

PRAGMA user_version = 2;
PRAGMA user_version = 3;

CREATE TABLE profile (
id TEXT NOT NULL PRIMARY KEY,
Expand Down Expand Up @@ -418,4 +418,4 @@ INSERT OR ROLLBACK INTO persist_hkv (header, key, value)

INSERT OR ROLLBACK INTO sequence (id, profile_id) VALUES ('dummy', 'dummy');

COMMIT TRANSACTION;
COMMIT TRANSACTION;