feat: add video to README, fix install typos.

README.md

@@ -32,7 +32,7 @@ make build
 make install # or sudo make install
 ```
 
-You can also see more detailed instructions [here](./user-scripts/ubuntu-20.04/install-with-dependencies.sh), for Ubuntu 20.04 in particular—though they should generalize trivially.
+You can also see more detailed instructions [here](./user-scripts/ubuntu-20.04/install-with-dependencies.sh), for Ubuntu 20.04 in particular—though they should generalize trivially. Or a video installing rosenrot in a fresh Ubuntu 20.04 virtual machine [here](https://video.nunosempere.com/w/t3oAvJLPHTSAMViQ6zbwTV).
 
 ### 👐 Contribute
 
@@ -41,7 +41,6 @@ You can also see more detailed instructions [here](./user-scripts/ubuntu-20.04/i
 
 ### To do
 
-- [ ] Add an installation tutorial
 - [ ] Look at using relative rather than absolute paths
 - [ ] Add css for js alerts
 - [ ] Figure out if downloading files is doable.
@@ -54,6 +53,10 @@ You can also see more detailed instructions [here](./user-scripts/ubuntu-20.04/i
 
 Done:
 
+- [x] Streamline installation a bit
+  - [x] Substitute paths in makefile
+  - [x] Create cache directory automatically
+- [x] Add an installation video walkthrough. Done, [here](https://video.nunosempere.com/w/t3oAvJLPHTSAMViQ6zbwTV)
 - [x] Document `stand_in.c` better
 - [x] Use a makefile.
   - [x] Add clean, uninstall to makefile

makefile

@@ -43,7 +43,25 @@ STYLE_BLUEPRINT=webkit
 FORMATTER=clang-format -i -style=$(STYLE_BLUEPRINT)
 ## Commands
 
+## Hardcoded paths
+## Cache
+USER=`whoami`
+DEFAULT_CACHE_DIR=/home/loki/.cache/rose
+CURRENT_CACHE_DIR=/home/$(USER)/.cache/rose
+## dir
+DEFAULT_DIR=/home/loki/Documents/core/software/fresh/C/rose-browser/rosenrot
+CURRENT_DIR=`pwd`
+
 build: $(SRC) $(PLUGS) $(CONFIG)
+	# Make cache
+	mkdir -p $(CURRENT_CACHE_DIR)
+	# Hardcode cache path
+	find $(CURRENT_DIR) -type f -not -path "*.git*" -not -path "*makefile*" -exec \
+		sed -i "s|$(DEFAULT_CACHE_DIR)|$(CURRENT_CACHE_DIR)|g" {} +
+	# Hardcode git repository path
+	find $(CURRENT_DIR) -type f -not -path "*.git*" -not -path "*makefile*" -exec \
+		sed -i "s|$(DEFAULT_DIR)|$(CURRENT_DIR)|g" {} +
+	# Compile rosenrot
 	$(CC) $(DEBUG) $(INCS) $(PLUGS) $(SRC) -o rose $(LIBS) $(ADBLOCK)
 
 install: rose
@@ -56,11 +74,12 @@ uninstall:
 	rm -r /usr/share/themes/rose
 	rm /usr/bin/rose
 	rm /usr/bin/rose-mklink
+	rm $(CACHE_DIR)
 
 clean:
 	rm rose
+	rm $(CACHE_DIR)
 
 format: $(SRC) $(PLUGS)
 	$(FORMATTER) $(SRC) $(PLUGS)
 
-

user-scripts/ubuntu-20.04/install-with-dependencies.sh

@@ -1,11 +1,11 @@
-# Dependencies
+# Key dependencies
+sudo apt install git vim gcc make
 sudo apt install libwebkit2gtk-4.0-dev
-sudo apt install clang
-# sudo apt instal sudo apt install gstreamer1.0-plugins-good gstreamer1.0-libav
 
-# Adblock
+# Optional adblock
 git clone https://github.com/jun7/wyebadblock
 cd wyebadblock
+sudo apt install gstreamer1.0-plugins-good gstreamer1.0-libav
 make
 sudo make install 
 cd ..
@@ -14,13 +14,6 @@ cd ~/.config/wyebadblock
 wget https://easylist.to/easylist/easylist.txt
 cd -
 
-# Rose config
-user=$(whoami)
-mkdir -p /home/$user/.cache/rose
-cp ../../config.def.h ../../config.h # you should also probably customize this yourself.
-sed "s/fenze/$user/g" ../../config.h
-
-# sudo bash ../../install.sh
 cd ../..
 make build # or just make
 sudo make install