Keeping symlinks and moving common dir into var/

jarv · Feb 12, 2017 · 419b7b2 · 419b7b2
1 parent 85b2f44
commit 419b7b2
Show file tree

Hide file tree

Showing 33 changed files with 29 additions and 29 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 test: docker
 	./bin/test_challenges
 docker: gen_readme
-	tar -hczf var.tar.gz var/
+	tar -czf var.tar.gz var/
 	docker build -t cmdline .
 	rm -f var.tar.gz
 	docker save cmdline > img.tar

diff --git a/challenges.yaml b/challenges.yaml
@@ -47,7 +47,7 @@
       lines:
         - 'README'
   - slug: list_files_adv
-    version: 1
+    version: 2
     author: gitunique
     description: |
       List all of the files in the current directory, display a slash (`/') immediately after
@@ -65,13 +65,13 @@
         - 'README'
         - 'normal-file.dat'
         - 'runthis.sh*'
-        - 'symlink-file.dat'
+        - 'symlink-file.dat@'
   - slug: nested_dirs
     version: 1
     author: gitunique
     description: |
       There is a file:
-      ./.../  /. /the flag.txt
+      ./.../  /. .the flag.txt
       Show its contents on the screen.
     example: cat ./.../\ \ /.\ .the\ flag.txt
     expected_output:

diff --git a/var/challenges/count_files/access.log b/var/challenges/count_files/access.log
@@ -1 +1 @@
-../../../common_files/access.log
+../../common/access.log
diff --git a/var/challenges/count_string_in_line/access.log b/var/challenges/count_string_in_line/access.log
@@ -1 +1 @@
-../../../common_files/access.log
+../../common/access.log
diff --git a/var/challenges/delete_files/var/log/httpd/access.log b/var/challenges/delete_files/var/log/httpd/access.log
@@ -1 +1 @@
-../../../../../../common_files/access.log
+../../../../../common/access.log
diff --git a/var/challenges/delete_files/var/log/httpd/access.log.1 b/var/challenges/delete_files/var/log/httpd/access.log.1
@@ -1 +1 @@
-../../../../../../common_files/access.log.1
+../../../../../common/access.log.1
diff --git a/var/challenges/delete_files/var/log/httpd/access.log.2 b/var/challenges/delete_files/var/log/httpd/access.log.2
@@ -1 +1 @@
-../../../../../../common_files/access.log.2
+../../../../../common/access.log.2
diff --git a/var/challenges/extract_ip_addresses/var/log/httpd/access.log b/var/challenges/extract_ip_addresses/var/log/httpd/access.log
@@ -1 +1 @@
-../../../../../../common_files/access.log
+../../../../../common/access.log
diff --git a/var/challenges/extract_ip_addresses/var/log/httpd/access.log.1 b/var/challenges/extract_ip_addresses/var/log/httpd/access.log.1
@@ -1 +1 @@
-../../../../../../common_files/access.log.1
+../../../../../common/access.log.1
diff --git a/var/challenges/find_string_in_a_file/access.log b/var/challenges/find_string_in_a_file/access.log
@@ -1 +1 @@
-../../../common_files/access.log
+../../common/access.log
diff --git a/var/challenges/last_lines/access.log b/var/challenges/last_lines/access.log
@@ -1 +1 @@
-../../../common_files/access.log
+../../common/access.log
diff --git a/var/challenges/nested_dirs/README b/var/challenges/nested_dirs/README
@@ -2,6 +2,6 @@
 # ***********
 
 # There is a file:
-# ./.../  /. /the flag.txt
+# ./.../  /. .the flag.txt
 # Show its contents on the screen.
 # 
diff --git a/var/challenges/print_file_contents/access.log b/var/challenges/print_file_contents/access.log
@@ -1 +1 @@
-../../../common_files/access.log
+../../common/access.log
diff --git a/var/challenges/print_nth_line/faces.txt b/var/challenges/print_nth_line/faces.txt
@@ -1 +1 @@
-../../../common_files/faces.txt
+../../common/faces.txt
diff --git a/var/challenges/remove_duplicate_lines/faces.txt b/var/challenges/remove_duplicate_lines/faces.txt
@@ -1 +1 @@
-../../../common_files/faces.txt
+../../common/faces.txt
diff --git a/var/challenges/search_for_files_by_extension/access.log b/var/challenges/search_for_files_by_extension/access.log
@@ -1 +1 @@
-../../../common_files/access.log
+../../common/access.log
diff --git a/var/challenges/search_for_files_by_extension/access.log.1 b/var/challenges/search_for_files_by_extension/access.log.1
@@ -1 +1 @@
-../../../common_files/access.log.1
+../../common/access.log.1
diff --git a/var/challenges/search_for_files_by_extension/access.log.2 b/var/challenges/search_for_files_by_extension/access.log.2
@@ -1 +1 @@
-../../../common_files/access.log.2
+../../common/access.log.2
diff --git a/var/challenges/search_for_files_containing_string/access.log b/var/challenges/search_for_files_containing_string/access.log
@@ -1 +1 @@
-../../../common_files/access.log
+../../common/access.log
diff --git a/var/challenges/search_for_files_containing_string/access.log.1 b/var/challenges/search_for_files_containing_string/access.log.1
@@ -1 +1 @@
-../../../common_files/access.log.1
+../../common/access.log.1
diff --git a/var/challenges/search_for_files_containing_string/access.log.2 b/var/challenges/search_for_files_containing_string/access.log.2
@@ -1 +1 @@
-../../../common_files/access.log.2
+../../common/access.log.2
diff --git a/var/challenges/search_for_string_in_files_recursive/var/log/httpd/access.log b/var/challenges/search_for_string_in_files_recursive/var/log/httpd/access.log
@@ -1 +1 @@
-../../../../../../common_files/access.log
+../../../../../common/access.log
diff --git a/var/challenges/search_for_string_in_files_recursive/var/log/httpd/access.log.1 b/var/challenges/search_for_string_in_files_recursive/var/log/httpd/access.log.1
@@ -1 +1 @@
-../../../../../../common_files/access.log.1
+../../../../../common/access.log.1
diff --git a/var/challenges/search_for_string_in_files_recursive/var/log/httpd/access.log.2 b/var/challenges/search_for_string_in_files_recursive/var/log/httpd/access.log.2
@@ -1 +1 @@
-../../../../../../common_files/access.log.2
+../../../../../common/access.log.2
diff --git a/var/challenges/simple_sort/access.log b/var/challenges/simple_sort/access.log
@@ -1 +1 @@
-../../../common_files/access.log
+../../common/access.log
diff --git a/var/challenges/split_on_a_char/split-me.txt b/var/challenges/split_on_a_char/split-me.txt
@@ -1 +1 @@
-../../../common_files/split-me.txt
+../../common/split-me.txt
diff --git a/var/challenges/sum_all_numbers/sum-me.txt b/var/challenges/sum_all_numbers/sum-me.txt
@@ -1 +1 @@
-../../../common_files/sum-me.txt
+../../common/sum-me.txt
diff --git a/common_files/access.log → var/common/access.log b/common_files/access.log → var/common/access.log
diff --git a/common_files/access.log.1 → var/common/access.log.1 b/common_files/access.log.1 → var/common/access.log.1
diff --git a/common_files/access.log.2 → var/common/access.log.2 b/common_files/access.log.2 → var/common/access.log.2
diff --git a/common_files/faces.txt → var/common/faces.txt b/common_files/faces.txt → var/common/faces.txt
diff --git a/common_files/split-me.txt → var/common/split-me.txt b/common_files/split-me.txt → var/common/split-me.txt
diff --git a/common_files/sum-me.txt → var/common/sum-me.txt b/common_files/sum-me.txt → var/common/sum-me.txt