fixes

configure.sh

@@ -63,10 +63,7 @@ else
   LAST_CONFIG_HASH="-"
 fi
 
-mkdir -p "$HOME/scratch"
-CONFIG_HASH_FILE="$HOME/scratch/config-hash.txt"
-
-cat <<EOF > "$CONFIG_HASH_FILE"
+cat <<EOF > "CONFIG_HASH_FILE"
 AWS_ACCESS_KEY="$AWS_ACCESS_KEY"
 AWS_SECRET_ACCESS_KEY="$AWS_SECRET_ACCESS_KEY"
 CARGO_NET_GIT_FETCH_WITH_CLI="$CARGO_NET_GIT_FETCH_WITH_CLI"
@@ -126,10 +123,7 @@ if [[ "$CONFIG_CHANGED" -eq 1 || ! -f "$HOME/.docker/config.json" ]]; then
   echo "== SETTING UP DOCKER USER CONFIG =="
   mkdir -p "$HOME/.docker"
   rm -fr "$HOME/.docker/config.json"
-  mkdir -p "$HOME/scratch"
-DOCKER_CONFIG_FILE="$HOME/scratch/config.json"
-
-cat <<EOF > "$DOCKER_CONFIG_FILE"
+  cat <<EOF > "$HOME/.docker/config.json"
 {
   "credHelpers": {
     "gcr.io": "gcloud",
@@ -144,7 +138,6 @@ cat <<EOF > "$DOCKER_CONFIG_FILE"
 
 EOF
 
-  cp "$DOCKER_CONFIG_FILE" "$HOME/.docker/config.json"
 else
   echo "== docker already configured =="
 fi
@@ -160,10 +153,7 @@ if [[ "$CONFIG_CHANGED" -eq 1 || ! -f "$NIX_USER_CONF_FILES" ]]; then
     echo "$NIX_SECRET_SIGN_KEY" > "$NIX_SECRET_SIGN_KEY_FILE"
   fi
 
-  mkdir -p "$HOME/scratch"
-NIX_USER_CONFIG_TEMPLATE_FILE="$HOME/scratch/nix.conf"
-
-cat <<EOF > "$NIX_USER_CONFIG_TEMPLATE_FILE"
+  cat <<EOF > "$NIX_USER_CONF_FILES"
 substituters = $NIX_S3_CACHE_LOCATION $NIXOS_CACHE_LOCATION
 trusted-public-keys = $NIXOS_CACHE_SIGN_KEY $NIX_SIGN_KEY
 trusted-substituters = $NIXOS_CACHE_LOCATION $NIX_S3_CACHE_LOCATION
@@ -171,7 +161,6 @@ always-allow-substitutes = true
 
 EOF
 
-  cp "$NIX_USER_CONFIG_TEMPLATE_FILE" "$NIX_USER_CONF_FILES"
 else
   echo "== nix already configured =="
 fi
@@ -180,17 +169,13 @@ if [[ "$CONFIG_CHANGED" -eq 1 || ! -f "$HOME/.aws/credentials" ]]; then
   echo "== SETTING UP AWS CREDENTIALS FOR NIX CACHE =="
 
   mkdir -p "$HOME/.aws"
-  mkdir -p "$HOME/scratch"
-AWS_CREDENTIALS_FILE="$HOME/scratch/aws-credentials-template"
-
-cat <<EOF > "$AWS_CREDENTIALS_FILE"
+  cat <<EOF > "$HOME/.aws/credentials"
 [default]
 aws_access_key_id=$AWS_ACCESS_KEY
 aws_secret_access_key=$AWS_SECRET_ACCESS_KEY
 
 EOF
 
-  cp "$AWS_CREDENTIALS_FILE" "$HOME/.aws/credentials"
 else
   echo "== aws credentials for nix cache already configured =="
 fi
@@ -207,17 +192,13 @@ fi
 
 if [[ "$CONFIG_CHANGED" -eq 1 || ! -f "$HOME/.netrc" ]]; then
   echo "== SETTING UP NETRC =="
-  mkdir -p "$HOME/scratch"
-NETRC_TEMPLATE_FILE="$HOME/scratch/netrc"
-
-cat <<EOF > "$NETRC_TEMPLATE_FILE"
+  cat <<EOF > "$HOME/.netrc"
 machine gitea.puzzleyou.net
 login $RUNNER_USERNAME
 password $RUNNER_PASSWORD
 
 EOF
 
-  cp "$NETRC_TEMPLATE_FILE" "$HOME/.netrc"
   chmod 600 "$HOME/.netrc"
 else
   echo "== netrc already configured =="
@@ -225,10 +206,7 @@ fi
 
 if [[ "$CONFIG_CHANGED" -eq 1 || ! -f "$HOME/.pypirc" ]]; then
   echo "== SETTING UP PYPIRC =="
-  mkdir -p "$HOME/scratch"
-PYPIRC_TEMPLATE_FILE="$HOME/scratch/pypirc"
-
-cat <<EOF > "$PYPIRC_TEMPLATE_FILE"
+  cat <<EOF > "$HOME/.pypirc"
 [distutils]
 index-servers = gitea
 
@@ -239,7 +217,6 @@ password = $RUNNER_PASSWORD
 
 EOF
 
-  cp "$PYPIRC_TEMPLATE_FILE" "$HOME/.pypirc"
 else
   echo "== pypirc already configured =="
 fi
@@ -250,15 +227,11 @@ if [[ "$CONFIG_CHANGED" -eq 1 || ! -f "$HOME/.config/git/config" ]]; then
   git config --global user.name "action-runner"
   git config --global credential.helper store
 
-  mkdir -p "$HOME/scratch"
-GIT_CREDENTIALS_FILE="$HOME/scratch/git-credentials"
-
-cat <<EOF > "$GIT_CREDENTIALS_FILE"
+  cat <<EOF > "$HOME/.git-credentials"
 $GITEA_INSTANCE_SCHEME://$RUNNER_USERNAME:$RUNNER_PASSWORD@$GITEA_INSTANCE
 
 EOF
 
-  cp "$GIT_CREDENTIALS_FILE" "$HOME/.git-credentials"
 else
   echo "== git already configured =="
 fi