Skip to content

Commit

Permalink
Merge branch 'master' into 264-ui-decryption
Browse files Browse the repository at this point in the history
  • Loading branch information
agibbons27 committed May 29, 2024
2 parents 84f8a6f + 8c08978 commit e152f41
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
1 change: 1 addition & 0 deletions docker/thumbtack/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.whl
8 changes: 4 additions & 4 deletions docker/thumbtack/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ RUN pip install thumbtack==0.4.2

WORKDIR "tmp/"
RUN apt install -y wget
RUN wget https://github.com/libyal/libewf/releases/download/20201230/libewf-experimental-20201230.tar.gz
RUN tar -xf libewf-experimental-20201230.tar.gz
WORKDIR "/tmp/libewf-20201230/"
RUN wget https://github.com/libyal/libewf/releases/download/20240506/libewf-experimental-20240506.tar.gz
RUN tar -xf libewf-experimental-20240506.tar.gz
WORKDIR "/tmp/libewf-20240506/"
RUN ./configure --enable-python3 --with-libfuse && make && make install
RUN cp /usr/local/lib/libewf* /usr/lib/
RUN rm -rf /tmp/libewf-experimental-20201230*
RUN rm -rf /tmp/libewf-experimental-20240506*


WORKDIR "/"
Expand Down
4 changes: 0 additions & 4 deletions src/thumbtack/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,6 @@ def add_mountpoint_form():
if mountpoint_path is None or mountpoint_path == "":
status = "No mountpoint provided."
return render_template("form_complete.html", status=status)
if not os.path.isdir(mountpoint_path):
status = f"Could not find {mountpoint_path}. Ensure the mountpoint exists before adding it to thumbtack."
return render_template("form_complete.html", status=status)

if operation == "add_mountpoint":
mounted_disk = add_mountpoint(rel_path, mountpoint_path)
if mounted_disk:
Expand Down

0 comments on commit e152f41

Please sign in to comment.