Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Srgr0 committed Jan 9, 2024
1 parent 158157c commit 2e59f12
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
9 changes: 7 additions & 2 deletions a.sh
Original file line number Diff line number Diff line change
Expand Up @@ -921,7 +921,12 @@ function install() {
echo "";
tput setaf 3; echo "Process: clone git repository;"; tput setaf 7;

sudo -iu "$misskey_user" git clone -b "$git_branch" --depth 1 --recursive "$git_repository" "$misskey_directory";
#git_repositoryがlocalならgit cloneしない
if [ $git_repository = "local" ]; then
echo "git_repository is local, skip git clone.";
else
sudo -iu "$misskey_user" git clone -b "$git_branch" --depth 1 --recursive "$git_repository" "$misskey_directory";
fi
}

#Create misskey config file
Expand Down Expand Up @@ -1646,7 +1651,7 @@ function install() {
install_packages;
add_user;
delete_misskey_directory;
if [ $method != "docker_hub" ] && [ $github_actions != true ]; then git_clone; fi
if [ $method != "docker_hub" ]; then git_clone; fi
create_config;
if $nginx_local; then open_ports; prepare_nginx; fi
if $cloudflaretunnel; then setup_cloudflaretunnel; fi
Expand Down
5 changes: 2 additions & 3 deletions testenv_githubactions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ method=systemd
#Misskey setting
docker_repository=hogehoge
docker_host_ip=hogehoge
#### In GitHub Actions, use the repository and branch where the workflow was executed.
git_repository=hogehoge
git_branch=hogehoge
git_repository=local
git_branch=local
misskey_directory=/home/misskey/misskey
misskey_localhost=localhost
misskey_user=misskey
Expand Down

0 comments on commit 2e59f12

Please sign in to comment.