3
2
Fork
You've already forked timecheck
5

new installation script #25

Open
jonas-l wants to merge 20 commits from jonas-l/timecheck:installation into testing
pull from: jonas-l/timecheck:installation
merge into: nuron:testing
nuron:master
nuron:testing
Contributor
Copy link

closes https://codeberg.org/nuron/timecheck/issues/24 and https://codeberg.org/nuron/timecheck/issues/17

closes <https://codeberg.org/nuron/timecheck/issues/24> and <https://codeberg.org/nuron/timecheck/issues/17>
j.r left a comment
Copy link

Just one little thing for now, but I still need to test it...

Just one little thing for now, but I still need to test it...
README_de.md Outdated
@ -67,2 +63,3 @@
Wenn das geschehen ist, steht der Nutzung nichts mehr im Wege!
Wenn du die Konfiguration von Timecheck ändern möchtest (was man nach der Installation tun sollte) führe bitte das Script
change-settings.sh
Collaborator
Copy link

You should also change this to sudo timecheck-config

You should also change this to `sudo timecheck-config`
@ -0,0 +9,4 @@
SELF_PATH="$(pwd -P)"
if [ -f "$SELF_PATH/config.custom.sh" ]; then
. "$SELF_PATH/config.custom.sh"
Owner
Copy link

source instead of '.' would be much easier to understand at the first view I guess.

source instead of '.' would be much easier to understand at the first view I guess.
Author
Contributor
Copy link

Well, within sh (and not bash), source is unknown while . works for me.

Well, within sh (and not bash), ``source`` is unknown while ``.`` works for me.
Owner
Copy link

Oh damn.
Then a comment must be enough.

May you insert a small one?

Oh damn. Then a comment must be enough. May you insert a small one?
j.r marked this conversation as resolved
j.r left a comment
Copy link

Just ran shellcheck over it

Just ran shellcheck over it
install.sh Outdated
@ -0,0 +30,4 @@
# 2ドル = value
createAssignVariableCode() {
echo -n "1ドル='"
echo -n "2ドル" | sed "s/'/'\\\\''/g" | head -n1
Collaborator
Copy link

In line 32 and 33 you use the -n flag which is according to shellcheck not defined in POSIX sh maybe printf should be used?

In line 32 and 33 you use the -n flag which is according to shellcheck not defined in POSIX sh maybe printf should be used?
Author
Contributor
Copy link

I will replace it by printf and test it next week.

I will replace it by printf and test it next week.
@ -0,0 +56,4 @@
# create the shortcut for the config util
mkdir -p "$BIN_PATH" || handleError
echo "$CONFIG_HEADER\n. \"\$SCRIPT_DIR/change-settings.sh\"" > "$BIN_PATH/timecheck-config" || handleError
Collaborator
Copy link

shellcheck tells here that echo may not expand the \n, maybe we should consider to use printf?

shellcheck tells here that echo may not expand the `\n`, maybe we should consider to use printf?
jonas-l marked this conversation as resolved
This pull request has changes conflicting with the target branch.
  • README_de.md
  • install-timecheck.sh
  • timecheck.sh
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u installation:jonas-l-installation
git switch jonas-l-installation

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch testing
git merge --no-ff jonas-l-installation
git switch jonas-l-installation
git rebase testing
git switch testing
git merge --ff-only jonas-l-installation
git switch jonas-l-installation
git rebase testing
git switch testing
git merge --no-ff jonas-l-installation
git switch testing
git merge --squash jonas-l-installation
git switch testing
git merge --ff-only jonas-l-installation
git switch testing
git merge jonas-l-installation
git push origin testing
Sign in to join this conversation.
No reviewers
j.r
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
3 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
nuron/timecheck!25
Reference in a new issue
nuron/timecheck
No description provided.
Delete branch "jonas-l/timecheck:installation"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?