File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -39,10 +39,10 @@ echo " $LOCAL_DIR/{html,db} created"
3939echo " [2/7] Checking WordPress..."
4040if [ ! -f " $HTML_DIR /wp-includes/version.php" ]; then
4141 echo " Downloading WordPress..."
42- curl -sL https://wordpress.org/latest.tar.gz -o /tmp/ wordpress-latest.tar.gz
43- tar xzf /tmp/ wordpress-latest.tar.gz -C /tmp/
44- cp -a /tmp/ wordpress/* " $HTML_DIR /"
45- rm -rf /tmp/ wordpress /tmp/ wordpress-latest.tar.gz
42+ curl -sL https://wordpress.org/latest.tar.gz -o " $HYPATIA_TMPDIR / wordpress" -latest.tar.gz
43+ tar xzf " $HYPATIA_TMPDIR / wordpress" -latest.tar.gz -C /tmp/
44+ cp -a " $HYPATIA_TMPDIR / wordpress" /* " $HTML_DIR /"
45+ rm -rf " $HYPATIA_TMPDIR / wordpress" " $HYPATIA_TMPDIR / wordpress" -latest.tar.gz
4646 echo " WordPress downloaded"
4747else
4848 echo " WordPress already present"
Original file line number Diff line number Diff line change @@ -107,8 +107,8 @@ if [ ! -f "$WHARF_ROOT/sites/$DOMAIN/html/wp-config.php" ]; then
107107
108108 echo " No WordPress found. Downloading..."
109109 curl -sL https://wordpress.org/latest.tar.gz | tar xz -C /tmp/
110- cp -r /tmp/ wordpress/* " $WHARF_ROOT /sites/$DOMAIN /html/"
111- rm -rf /tmp/ wordpress
110+ cp -r " $HYPATIA_TMPDIR / wordpress" /* " $WHARF_ROOT /sites/$DOMAIN /html/"
111+ rm -rf " $HYPATIA_TMPDIR / wordpress"
112112
113113 # Write wp-config.php pointing DB through the yacht-agent proxy
114114 cat > " $WHARF_ROOT /sites/$DOMAIN /html/wp-config.php" << WPEOF
Original file line number Diff line number Diff line change @@ -167,12 +167,12 @@ if [ "$BUILD" = true ]; then
167167 log_info " Test 5: Quick container run test..."
168168
169169 # Create a simple test
170- mkdir -p /tmp/ wharf-test
171- echo ' <?php phpinfo(); ?>' > /tmp/ wharf-test/index.php
172- echo ' <html><body><h1>Wharf Test</h1></body></html>' > /tmp/ wharf-test/index.html
170+ mkdir -p " $HYPATIA_TMPDIR / wharf-test"
171+ echo ' <?php phpinfo(); ?>' > " $HYPATIA_TMPDIR / wharf-test" /index.php
172+ echo ' <html><body><h1>Wharf Test</h1></body></html>' > " $HYPATIA_TMPDIR / wharf-test" /index.html
173173
174174 # Try to start nginx container briefly
175- CONTAINER_ID=$( podman run -d --rm -p 18080:8080 -v /tmp/ wharf-test:/var/www/html:ro yacht-nginx:test 2> /dev/null || echo " " )
175+ CONTAINER_ID=$( podman run -d --rm -p 18080:8080 -v " $HYPATIA_TMPDIR / wharf-test" :/var/www/html:ro yacht-nginx:test 2> /dev/null || echo " " )
176176
177177 if [ -n " $CONTAINER_ID " ]; then
178178 sleep 2
@@ -197,7 +197,7 @@ if [ "$BUILD" = true ]; then
197197 fail_test " Failed to start nginx container"
198198 fi
199199
200- rm -rf /tmp/ wharf-test
200+ rm -rf " $HYPATIA_TMPDIR / wharf-test"
201201fi
202202
203203# =============================================================================
You can’t perform that action at this time.
0 commit comments